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
67b152ab
Commit
67b152ab
authored
Aug 27, 2017
by
Rémi Verschelde
Committed by
GitHub
Aug 27, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10671 from hpvb/fix-10654
Add two missing Null checks
parents
53c00109
3e25cf9e
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 @
67b152ab
...
...
@@ -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 @
67b152ab
...
...
@@ -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