1 files changed, 27 insertions, 7 deletions

diff --git a/tools/editor/multi_node_edit.cpp b/tools/editor/multi_node_edit.cpp
index 47b776ed06..0428d7ef30 100644
--- a/tools/editor/multi_node_edit.cpp
+++ b/tools/editor/multi_node_edit.cpp
@@ -27,18 +27,25 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "multi_node_edit.h"
+
 #include "editor_node.h"
+#include "core/helper/math_fieldwise.h"
 
 bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
 
+	return _set_impl(p_name, p_value, "");
+}
+
+bool MultiNodeEdit::_set_impl(const StringName& p_name, const Variant& p_value, const String& p_field) {
+
 	Node *es = EditorNode::get_singleton()->get_edited_scene();
 	if (!es)
 		return false;
 
 	String name = p_name;
 
-	if (name=="scripts/script") { // script/script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
-		name="script/script";
+	if (name=="scripts") { // script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
+		name="script";
 	}
 
 	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
@@ -58,7 +65,15 @@ bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
 			NodePath p_path = n->get_path_to(tonode);
 			ur->add_do_property(n,name,p_path);
 		} else {
-			ur->add_do_property(n,name,p_value);
+			Variant new_value;
+			if (p_field=="") {
+				// whole value
+				new_value=p_value;
+			} else {
+				// only one field
+				new_value=fieldwise_assign(n->get(name),p_value,p_field);
+			}
+			ur->add_do_property(n,name,new_value);
 		}
 
 		ur->add_undo_property(n,name,n->get(name));
@@ -79,8 +94,8 @@ bool MultiNodeEdit::_get(const StringName& p_name,Variant &r_ret) const {
 		return false;
 
 	String name=p_name;
-	if (name=="scripts/script") { // script/script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
-		name="script/script";
+	if (name=="scripts") { // script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
+		name="script";
 	}
 
 	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
@@ -128,7 +143,7 @@ void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
 
 		for(List<PropertyInfo>::Element *F=plist.front();F;F=F->next()) {
 
-			if (F->get().name=="script/script")
+			if (F->get().name=="script")
 				continue; //added later manually, since this is intercepted before being set (check Variant Object::get() )
 			if (!usage.has(F->get().name)) {
 				PLData pld;
@@ -151,7 +166,7 @@ void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
 		}
 	}
 
-	p_list->push_back(PropertyInfo(Variant::OBJECT,"scripts/script",PROPERTY_HINT_RESOURCE_TYPE,"Script"));
+	p_list->push_back(PropertyInfo(Variant::OBJECT,"scripts",PROPERTY_HINT_RESOURCE_TYPE,"Script"));
 
 
 }
@@ -166,6 +181,11 @@ void MultiNodeEdit::add_node(const NodePath& p_node){
 	nodes.push_back(p_node);
 }
 
+void MultiNodeEdit::set_property_field(const StringName& p_property, const Variant& p_value, const String& p_field) {
+
+	_set_impl(p_property, p_value, p_field);
+}
+
 MultiNodeEdit::MultiNodeEdit()
 {
 }