Fix T58556: Some remaining 'dupli_types' in pycode after renaming.
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Dec 2018 09:38:46 +0000 (10:38 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Dec 2018 09:39:54 +0000 (10:39 +0100)
intern/cycles/blender/addon/ui.py
tests/python/view_layer/test_group_e.py

index 7fef443bf8a15373b371ff44d74ab7f44fca75a5..afd13b304cefcefc9fd6ec5275f63f95597f242a 100644 (file)
@@ -1123,7 +1123,7 @@ class CYCLES_OBJECT_PT_motion_blur(CyclesButtonsPanel, Panel):
         if CyclesButtonsPanel.poll(context) and ob:
             if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA'}:
                 return True
-            if ob.dupli_type == 'COLLECTION' and ob.dupli_group:
+            if ob.instance_type == 'COLLECTION' and ob.instance_collection:
                 return True
             # TODO(sergey): More duplicator types here?
         return False
@@ -1168,7 +1168,7 @@ class CYCLES_OBJECT_PT_cycles_settings(CyclesButtonsPanel, Panel):
         ob = context.object
         return (CyclesButtonsPanel.poll(context) and
                 ob and ((ob.type in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META', 'LIGHT'}) or
-                        (ob.dupli_type == 'COLLECTION' and ob.dupli_group)))
+                        (ob.instance_type == 'COLLECTION' and ob.instance_collection)))
 
     def draw(self, context):
         pass
index 14385411ecaa8eab2dad6c81b686c57e405da134..7385d94f1f43691bdf2ae84f7c7281c9bd698abb 100644 (file)
@@ -44,8 +44,8 @@ class UnitTesting(ViewLayerTesting):
         empty = bpy.data.objects.new("Empty", None)
         bpy.context.scene_collection.objects.link(empty)
         layer_collection = bpy.context.layer_collection
-        empty.dupli_type = 'GROUP'
-        empty.dupli_group = group
+        empty.instance_type = 'GROUP'
+        empty.instance_collection = group
 
         # prepare to delete the original object
         # we could just pass an overridden context