diff options
| author | BastiaanOlij <mux213@gmail.com> | 2017-01-10 21:08:40 +1100 |
|---|---|---|
| committer | BastiaanOlij <mux213@gmail.com> | 2017-01-10 21:42:14 +1100 |
| commit | bf990b0822c1b5a09f9584ed7c2b83edecabf375 (patch) | |
| tree | 1ca9c6a602571c92277b3a0b822fa9ef4c45eab6 /scene/resources | |
| parent | 48097f6df364b040848fb8963f15738d760a72ed (diff) | |
Few small fixes so tools=no and target=release compiles
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index b0161f6898..625cc6a596 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1777,9 +1777,9 @@ bool PackedScene::can_instance() const { Node *PackedScene::instance(GenEditState p_edit_state) const { #ifndef TOOLS_ENABLED - if (p_gen_edit_state) { + if (p_edit_state!=GEN_EDIT_STATE_DISABLED) { ERR_EXPLAIN("Edit state is only for editors, does not work without tools compiled"); - ERR_FAIL_COND_V(p_gen_edit_state,NULL); + ERR_FAIL_COND_V(p_edit_state!=GEN_EDIT_STATE_DISABLED,NULL); } #endif |