maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3302 from MarianoGnu/bug_fixing2

Browse source 
Allow to paste resources in inspector when text_hint indicates multip…
This commit is contained in:
Rémi Verschelde 2016-01-11 08:53:35 +01:00
parent 373af4f620 21b5e9eef4
commit a8a09f6180
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/editor/property_editor.cpp
View file

@ -727,7 +727,17 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
RES cb=EditorSettings::get_singleton()->get_resource_clipboard();
bool paste_valid=cb.is_valid() && (hint_text=="" || ObjectTypeDB::is_type(cb->get_type(),hint_text));
bool paste_valid=false;
if (cb.is_valid()) {
if (hint_text=="")
paste_valid=true;
else
for (int i = 0; i < hint_text.get_slice_count(",");i++)
if (ObjectTypeDB::is_type(cb->get_type(),hint_text.get_slice(",",i))) {
paste_valid=true;
break;
}
}
if (!RES(v).is_null() || paste_valid) {
menu->add_separator();