blender
/
blender-addons
17
34
Fork 94
Code Issues 530 Pull Requests 32 Projects 1 Releases Wiki Activity

BlenderKit: fix appending of assets 

This would unnecessarily create full copies instead of linked objects (as linked data, not linked from outer file)
This commit is contained in:
Vilém Duha 2020-08-01 20:15:33 +02:00
parent 9adfdc2300
commit e74f7ad92d
1 changed files with 79 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
blenderkit/download.py
View File

@ -316,6 +316,18 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
al = 'LINK'
else:
al = 'APPEND'
if asset_data['assetType'] == 'model':
source_parent = get_asset_in_scene(asset_data)
parent, new_obs = duplicate_asset(source=source_parent, **kwargs)
parent.location = kwargs['model_location']
parent.rotation_euler = kwargs['model_rotation']
# this is a case where asset is already in scene and should be duplicated instead.
# there is a big chance that the duplication wouldn't work perfectly(hidden or unselectable objects)
# so here we need to check and return if there was success
# also, if it was successful, no other operations are needed , basically all asset data is already ready from the original asset
if new_obs:
bpy.ops.wm.undo_push_context(message='add %s to scene' % asset_data['name'])
return
# first get conditions for append link
link = al == 'LINK'
@ -333,7 +345,7 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
return
if link:
parent, newobs = append_link.link_collection(file_names[-1],
parent, new_obs = append_link.link_collection(file_names[-1],
location=downloader['location'],
rotation=downloader['rotation'],
link=link,
@ -342,7 +354,7 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
else:
parent, newobs = append_link.append_objects(file_names[-1],
parent, new_obs = append_link.append_objects(file_names[-1],
location=downloader['location'],
rotation=downloader['rotation'],
link=link,
@ -356,21 +368,21 @@ def append_asset(asset_data, **kwargs): # downloaders=[], location=None,
elif kwargs.get('model_location') is not None:
if link:
parent, newobs = append_link.link_collection(file_names[-1],
parent, new_obs = append_link.link_collection(file_names[-1],
location=kwargs['model_location'],
rotation=kwargs['model_rotation'],
link=link,
name=asset_data['name'],
parent=kwargs.get('parent'))
else:
parent, newobs = append_link.append_objects(file_names[-1],
parent, new_obs = append_link.append_objects(file_names[-1],
location=kwargs['model_location'],
rotation=kwargs['model_rotation'],
link=link,
name=asset_data['name'],
parent=kwargs.get('parent'))
#scale Empty for assets, so they don't clutter the scene.
# scale Empty for assets, so they don't clutter the scene.
if parent.type == 'EMPTY' and link:
bmin = asset_data['bbox_min']
bmax = asset_data['bbox_max']
@ -733,6 +745,66 @@ def try_finished_append(asset_data, **kwargs): # location=None, material_target
return done
def get_asset_in_scene(asset_data):
'''tries to find an appended copy of particular asset and duplicate it - so it doesn't have to be appended again.'''
scene = bpy.context.scene
for ob in bpy.context.scene.objects:
ad1 = ob.get('asset_data')
if not ad1:
continue
if ad1.get('assetBaseId') == asset_data['assetBaseId']:
return ob
return None
def check_all_visible(obs):
'''checks all objects are visible, so they can be manipulated/copied.'''
for ob in obs:
if not ob.visible_get():
return False
return True
def check_selectible(obs):
'''checks if all objects can be selected and selects them if possible.
this isn't only select_hide, but all possible combinations of collections e.t.c. so hard to check otherwise.'''
for ob in obs:
ob.select_set(True)
if not ob.select_get():
return False
return True
def duplicate_asset(source, **kwargs):
'''Duplicate asset when it's already appended in the scene, so that blender's append doesn't create duplicated data.'''
# we need to save selection
sel = utils.selection_get()
bpy.ops.object.select_all(action='DESELECT')
# check visibility
obs = utils.get_hierarchy(source)
if not check_all_visible(obs):
return None
# check selectability and select in one run
if not check_selectible(obs):
return None
# duplicate the asset objects
bpy.ops.object.duplicate(linked=True)
nobs = bpy.context.selected_objects[:]
#get parent
for ob in nobs:
if ob.parent not in nobs:
parent = ob
break
# restore original selection
utils.selection_set(sel)
return parent , nobs
def asset_in_scene(asset_data):
'''checks if the asset is already in scene. If yes, modifies asset data so the asset can be reached again.'''
scene = bpy.context.scene
@ -746,10 +818,10 @@ def asset_in_scene(asset_data):
asset_data['file_name'] = ad['file_name']
asset_data['url'] = ad['url']
#browse all collections since linked collections can have same name.
# browse all collections since linked collections can have same name.
for c in bpy.data.collections:
if c.name == ad['name']:
#there can also be more linked collections with same name, we need to check id.
# there can also be more linked collections with same name, we need to check id.
if c.library and c.library.get('asset_data') and c.library['asset_data']['assetBaseId'] == id:
return 'LINKED'
return 'APPENDED'