Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
e0a00154
Commit
e0a00154
authored
May 09, 2020
by
Ignacio Etcheverry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mono: Fix hot-reloading of nested classes
parent
825a89d0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
6 deletions
+21
-6
csharp_script.cpp
modules/mono/csharp_script.cpp
+1
-1
gd_mono_class.cpp
modules/mono/mono_gd/gd_mono_class.cpp
+16
-2
gd_mono_class.h
modules/mono/mono_gd/gd_mono_class.h
+4
-3
No files found.
modules/mono/csharp_script.cpp
View file @
e0a00154
...
@@ -850,7 +850,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
...
@@ -850,7 +850,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
to_reload
.
push_back
(
script
);
to_reload
.
push_back
(
script
);
if
(
script
->
get_path
().
empty
())
{
if
(
script
->
get_path
().
empty
())
{
script
->
tied_class_name_for_reload
=
script
->
script_class
->
get_name
();
script
->
tied_class_name_for_reload
=
script
->
script_class
->
get_name
_for_lookup
();
script
->
tied_class_namespace_for_reload
=
script
->
script_class
->
get_namespace
();
script
->
tied_class_namespace_for_reload
=
script
->
script_class
->
get_namespace
();
}
}
...
...
modules/mono/mono_gd/gd_mono_class.cpp
View file @
e0a00154
...
@@ -79,12 +79,26 @@ bool GDMonoClass::is_assignable_from(GDMonoClass *p_from) const {
...
@@ -79,12 +79,26 @@ bool GDMonoClass::is_assignable_from(GDMonoClass *p_from) const {
return
mono_class_is_assignable_from
(
mono_class
,
p_from
->
mono_class
);
return
mono_class_is_assignable_from
(
mono_class
,
p_from
->
mono_class
);
}
}
GDMonoClass
*
GDMonoClass
::
get_parent_class
()
{
StringName
GDMonoClass
::
get_namespace
()
const
{
GDMonoClass
*
nesting_class
=
get_nesting_class
();
if
(
!
nesting_class
)
return
namespace_name
;
return
nesting_class
->
get_namespace
();
}
String
GDMonoClass
::
get_name_for_lookup
()
const
{
GDMonoClass
*
nesting_class
=
get_nesting_class
();
if
(
!
nesting_class
)
return
class_name
;
return
nesting_class
->
get_name_for_lookup
()
+
"/"
+
class_name
;
}
GDMonoClass
*
GDMonoClass
::
get_parent_class
()
const
{
MonoClass
*
parent_mono_class
=
mono_class_get_parent
(
mono_class
);
MonoClass
*
parent_mono_class
=
mono_class_get_parent
(
mono_class
);
return
parent_mono_class
?
GDMono
::
get_singleton
()
->
get_class
(
parent_mono_class
)
:
nullptr
;
return
parent_mono_class
?
GDMono
::
get_singleton
()
->
get_class
(
parent_mono_class
)
:
nullptr
;
}
}
GDMonoClass
*
GDMonoClass
::
get_nesting_class
()
{
GDMonoClass
*
GDMonoClass
::
get_nesting_class
()
const
{
MonoClass
*
nesting_type
=
mono_class_get_nesting_type
(
mono_class
);
MonoClass
*
nesting_type
=
mono_class_get_nesting_type
(
mono_class
);
return
nesting_type
?
GDMono
::
get_singleton
()
->
get_class
(
nesting_type
)
:
nullptr
;
return
nesting_type
?
GDMono
::
get_singleton
()
->
get_class
(
nesting_type
)
:
nullptr
;
}
}
...
...
modules/mono/mono_gd/gd_mono_class.h
View file @
e0a00154
...
@@ -113,14 +113,15 @@ public:
...
@@ -113,14 +113,15 @@ public:
bool
is_assignable_from
(
GDMonoClass
*
p_from
)
const
;
bool
is_assignable_from
(
GDMonoClass
*
p_from
)
const
;
_FORCE_INLINE_
StringName
get_namespace
()
const
{
return
namespace_name
;
}
StringName
get_namespace
()
const
;
_FORCE_INLINE_
StringName
get_name
()
const
{
return
class_name
;
}
_FORCE_INLINE_
StringName
get_name
()
const
{
return
class_name
;
}
String
get_name_for_lookup
()
const
;
_FORCE_INLINE_
MonoClass
*
get_mono_ptr
()
const
{
return
mono_class
;
}
_FORCE_INLINE_
MonoClass
*
get_mono_ptr
()
const
{
return
mono_class
;
}
_FORCE_INLINE_
const
GDMonoAssembly
*
get_assembly
()
const
{
return
assembly
;
}
_FORCE_INLINE_
const
GDMonoAssembly
*
get_assembly
()
const
{
return
assembly
;
}
GDMonoClass
*
get_parent_class
();
GDMonoClass
*
get_parent_class
()
const
;
GDMonoClass
*
get_nesting_class
();
GDMonoClass
*
get_nesting_class
()
const
;
#ifdef TOOLS_ENABLED
#ifdef TOOLS_ENABLED
Vector
<
MonoClassField
*>
get_enum_fields
();
Vector
<
MonoClassField
*>
get_enum_fields
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment