diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-06 09:32:52 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-06 09:33:59 -0300 |
| commit | 475e8b28b28962a24b783597f9a3cabf4a370dee (patch) | |
| tree | 6c6d86841bafdfbbd7a07d5593813d422413f06a /scene/resources | |
| parent | a18c8606bbc16e3274b8be9f79715023b10ce3e2 (diff) | |
keep default exported script values unless overriden, closes #8127
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 3 | ||||
| -rw-r--r-- | scene/resources/texture.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 6bf3590c12..648900a5cd 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -516,6 +516,9 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map bool isdefault = ((E->get().usage & PROPERTY_USAGE_STORE_IF_NONZERO) && value.is_zero()) || ((E->get().usage & PROPERTY_USAGE_STORE_IF_NONONE) && value.is_one()); + if (E->get().usage & PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE) { + isdefault = true; //is script default value + } /* if (nd.instance<0 && ((E->get().usage & PROPERTY_USAGE_STORE_IF_NONZERO) && value.is_zero()) || ((E->get().usage & PROPERTY_USAGE_STORE_IF_NONONE) && value.is_one())) { continue; diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index fe7cd0097c..dbe5d5a257 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -194,6 +194,7 @@ void ImageTexture::create(int p_width, int p_height, Image::Format p_format, uin } void ImageTexture::create_from_image(const Ref<Image> &p_image, uint32_t p_flags) { + ERR_FAIL_COND(p_image.is_null()); flags = p_flags; w = p_image->get_width(); h = p_image->get_height(); |