Asset Pipeline v2 #145
@ -177,6 +177,14 @@ class AssetTransferMapping:
|
|||||||
if check_transfer_data_item.owner != transfer_data_item.owner and not (
|
if check_transfer_data_item.owner != transfer_data_item.owner and not (
|
||||||
check_transfer_data_item.surrender or transfer_data_item.surrender
|
check_transfer_data_item.surrender or transfer_data_item.surrender
|
||||||
):
|
):
|
||||||
|
# In the case where we have a modifier where I changed my local task layer
|
||||||
|
# this should not return as a conflict
|
||||||
|
# Do this only if both task layers are local to the current file
|
||||||
|
if (
|
||||||
|
check_transfer_data_item.owner in self._local_tls
|
||||||
|
and transfer_data_item.owner in self._local_tls
|
||||||
|
):
|
||||||
|
return
|
||||||
self.conflict_transfer_data.append(transfer_data_item)
|
self.conflict_transfer_data.append(transfer_data_item)
|
||||||
print("CONFLICT FOUND")
|
print("CONFLICT FOUND")
|
||||||
return True
|
return True
|
||||||
|
Loading…
Reference in New Issue
Block a user