1 files changed, 19 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index e98181be444..a3bd15252cb 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -474,6 +474,7 @@ static IDProperty *IDP_CopyGroup(const IDProperty *prop)
 	BLI_assert(prop->type == IDP_GROUP);
 	newp = idp_generic_copy(prop);
 	newp->len = prop->len;
+	newp->subtype = prop->subtype;
 
 	for (link = prop->data.group.first; link; link = link->next) {
 		BLI_addtail(&newp->data.group, IDP_CopyProperty(link));
@@ -600,6 +601,7 @@ void IDP_ReplaceInGroup(IDProperty *group, IDProperty *prop)
 
 /**
  * If a property is missing in \a dest, add it.
+ * Do it recursively.
  */
 void IDP_MergeGroup(IDProperty *dest, const IDProperty *src, const bool do_overwrite)
 {
@@ -610,13 +612,29 @@ void IDP_MergeGroup(IDProperty *dest, const IDProperty *src, const bool do_overw
 
 	if (do_overwrite) {
 		for (prop = src->data.group.first; prop; prop = prop->next) {
+			if (prop->type == IDP_GROUP) {
+				IDProperty *prop_exist = IDP_GetPropertyFromGroup(dest, prop->name);
+
+				if (prop_exist != NULL) {
+					IDP_MergeGroup(prop_exist, prop, do_overwrite);
+					continue;
+				}
+			}
+
 			IDProperty *copy = IDP_CopyProperty(prop);
 			IDP_ReplaceInGroup(dest, copy);
 		}
 	}
 	else {
 		for (prop = src->data.group.first; prop; prop = prop->next) {
-			if (IDP_GetPropertyFromGroup(dest, prop->name) == NULL) {
+			IDProperty *prop_exist = IDP_GetPropertyFromGroup(dest, prop->name);
+			if (prop_exist != NULL) {
+				if (prop->type == IDP_GROUP) {
+					IDP_MergeGroup(prop_exist, prop, do_overwrite);
+					continue;
+				}
+			}
+			else {
 				IDProperty *copy = IDP_CopyProperty(prop);
 				dest->len++;
 				BLI_addtail(&dest->data.group, copy);