diff options
| author | reduz <reduzio@gmail.com> | 2014-06-17 11:55:26 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-06-17 11:55:26 -0300 |
| commit | 59fd2c51f69aeb56805a18bd15b42928e165ba60 (patch) | |
| tree | 4ecd8f821c6969e56325a1bf06bd7c6be6d22a60 | |
| parent | 3384d5b1b9ec4636196e8627c315e1592b0f5da0 (diff) | |
| parent | 2b6106541c47f77b5778ec71fda74540cbc31149 (diff) | |
Merge pull request #512 from marynate/PR-fix-texture-preview-not-update
Fixed #185 Setting a new Texture for a Sprite node does not update preview
| -rw-r--r-- | tools/editor/property_editor.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 2197902933..4ac2ff0594 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -1828,6 +1828,13 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p if (obj->get( p_name ).get_type() == Variant::NIL || obj->get( p_name ).operator RefPtr().is_null()) { p_item->set_text(1,"<null>"); + Dictionary d = p_item->get_metadata(0); + int hint=d.has("hint")?d["hint"].operator int():-1; + String hint_text=d.has("hint_text")?d["hint_text"]:""; + if (hint==PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Texture") { + p_item->set_icon(1,NULL); + } + } else { RES res = obj->get( p_name ).operator RefPtr(); if (res->is_type("Texture")) { |