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
3e25cf9e
Commit
3e25cf9e
authored
Aug 26, 2017
by
Hein-Pieter van Braam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add two missing Null checks
These Null checks were removed in #10581 but actually changed the logic of the functions in this case. This fixes #10654
parent
53c00109
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
gd_editor.cpp
modules/gdscript/gd_editor.cpp
+6
-2
scene_tree.cpp
scene/main/scene_tree.cpp
+4
-1
No files found.
modules/gdscript/gd_editor.cpp
View file @
3e25cf9e
...
...
@@ -1546,7 +1546,9 @@ static void _find_type_arguments(GDCompletionContext &context, const GDParser::N
scr
=
NULL
;
}
}
else
{
on_script
=
obj
->
get_script
();
if
(
obj
)
{
on_script
=
obj
->
get_script
();
}
}
}
...
...
@@ -2237,7 +2239,9 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
scr
=
NULL
;
}
}
else
{
on_script
=
obj
->
get_script
();
if
(
obj
)
{
on_script
=
obj
->
get_script
();
}
}
}
...
...
scene/main/scene_tree.cpp
View file @
3e25cf9e
...
...
@@ -1401,8 +1401,11 @@ void SceneTree::_live_edit_create_node_func(const NodePath &p_parent, const Stri
Node
*
n2
=
n
->
get_node
(
p_parent
);
Node
*
no
=
Object
::
cast_to
<
Node
>
(
ClassDB
::
instance
(
p_type
));
no
->
set_name
(
p_name
);
if
(
!
no
)
{
continue
;
}
no
->
set_name
(
p_name
);
n2
->
add_child
(
no
);
}
}
...
...
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