archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Use collection and instance terminology in Python API

Browse Source 
This follows naming convention agreed on in T56648.
This commit is contained in:
Sergey Sharybin
2018-11-28 17:49:52 +01:00
parent 98ecab1af0
commit 7c7f3776dd
31 changed files with 190 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/bpy_extras/io_utils.py
View File

@@ -341,10 +341,10 @@ def axis_conversion_ensure(operator, forward_attr, up_attr):
# return a tuple (free, object list), free is True if memory should be freed
# later with free_derived_objects()
def create_derived_objects(scene, ob):
if ob.parent and ob.parent.dupli_type in {'VERTS', 'FACES'}:
if ob.parent and ob.parent.instance_type in {'VERTS', 'FACES'}:
return False, None
if ob.dupli_type != 'NONE':
if ob.instance_type != 'NONE':
ob.dupli_list_create(scene)
return True, [(dob.object, dob.matrix) for dob in ob.dupli_list]
else: