[Bf-blender-cvs] [394b086b9c1] blender2.8: Fix T58556: Some remaining 'dupli_types' in pycode after renaming.

[Bastien Montagne]

Commit: 394b086b9c1933122fec9a72db538c6a804a23cf
Author: Bastien Montagne
Date:   Mon Dec 3 10:38:46 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB394b086b9c1933122fec9a72db538c6a804a23cf

Fix T58556: Some remaining 'dupli_types' in pycode after renaming.

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

M	intern/cycles/blender/addon/ui.py
M	tests/python/view_layer/test_group_e.py

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 7fef443bf8a..afd13b304ce 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -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
diff --git a/tests/python/view_layer/test_group_e.py b/tests/python/view_layer/test_group_e.py
index 14385411eca..7385d94f1f4 100644
--- a/tests/python/view_layer/test_group_e.py
+++ b/tests/python/view_layer/test_group_e.py
@@ -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