[Bf-blender-cvs] [2ddee0ba5ac] blender2.8: Fix dupli-frames (and other duplis)

[Dalai Felinto]

Commit: 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b
Author: Dalai Felinto
Date:   Fri Dec 15 07:05:50 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b

Fix dupli-frames (and other duplis)

Even non-group dupli objects need to get the overrides from somewhere.
Getting them from dupli_parent.

===================================================================

M	source/blender/depsgraph/intern/depsgraph_query_iter.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index d8a54642a85..083dd17217a 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -83,9 +83,15 @@ static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
 		*temp_dupli_object = *dob->ob;
 		temp_dupli_object->select_color = dupli_parent->select_color;
 		temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROMDUPLI;
-		BLI_assert(dob->collection_properties != NULL);
-		temp_dupli_object->base_collection_properties = dob->collection_properties;
-		IDP_MergeGroup(temp_dupli_object->base_collection_properties, dupli_parent->base_collection_properties, false);
+
+		if (dob->collection_properties != NULL) {
+			temp_dupli_object->base_collection_properties = dob->collection_properties;
+			IDP_MergeGroup(temp_dupli_object->base_collection_properties, dupli_parent->base_collection_properties, false);
+		}
+		else {
+			temp_dupli_object->base_collection_properties = dupli_parent->base_collection_properties;
+		}
+
 		copy_m4_m4(data->temp_dupli_object.obmat, dob->mat);
 		iter->current = &data->temp_dupli_object;
 		BLI_assert(