Render instancing can now also handle the same object in multiple,

non-animated dupligroups.

1 files changed, 14 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index b29cf63ab0b..a85f0f52ad2 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -191,6 +191,20 @@ void group_tag_recalc(Group *group)
 	}
 }
 
+int group_is_animated(Object *parent, Group *group)
+{
+	GroupObject *go;
+
+	if(give_timeoffset(parent) != 0.0f || parent->nlastrips.first)
+		return 1;
+
+	for(go= group->gobject.first; go; go= go->next)
+		if(go->ob && go->ob->proxy)
+			return 1;
+
+	return 0;
+}
+
 /* only replaces object strips or action when parent nla instructs it */
 /* keep checking nla.c though, in case internal structure of strip changes */
 static void group_replaces_nla(Object *parent, Object *target, char mode)
@@ -231,7 +245,6 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
 	}
 }
 
-
 /* puts all group members in local timing system, after this call
 you can draw everything, leaves tags in objects to signal it needs further updating */