Asset Pipeline v2 #145
@ -196,7 +196,7 @@ def merge_task_layer(
|
|||||||
|
|
||||||
# Remove all transfer data from target objects
|
# Remove all transfer data from target objects
|
||||||
for source_obj in map.object_map:
|
for source_obj in map.object_map:
|
||||||
if source_obj.data.users > 1:
|
if source_obj.data and source_obj.data.users > 1:
|
||||||
error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
|
error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
|
||||||
return error_msg
|
return error_msg
|
||||||
target_obj = map.object_map[source_obj]
|
target_obj = map.object_map[source_obj]
|
||||||
@ -205,10 +205,10 @@ def merge_task_layer(
|
|||||||
apply_transfer_data(context, map.transfer_data_map)
|
apply_transfer_data(context, map.transfer_data_map)
|
||||||
|
|
||||||
for source_obj in map.object_map:
|
for source_obj in map.object_map:
|
||||||
if target_obj.data.users > 1:
|
|
||||||
error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
|
|
||||||
return error_msg
|
|
||||||
target_obj = map.object_map[source_obj]
|
target_obj = map.object_map[source_obj]
|
||||||
|
if target_obj.data and target_obj.data.users > 1:
|
||||||
|
error_msg += f"Object {target_obj.name} contains multi-user datablock'\n"
|
||||||
|
return error_msg
|
||||||
remap_user(source_obj, target_obj)
|
remap_user(source_obj, target_obj)
|
||||||
transfer_data_clean(target_obj)
|
transfer_data_clean(target_obj)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user