Resolve merge conflict

This commit is contained in:
Roy Nieterau 2024-04-30 06:47:08 +02:00
parent 4512a088e9
commit 07bd2e21de

View file

@ -255,7 +255,8 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
if scene_parent:
cmds.parent(node, scene_parent)
else:
cmds.parent(node, world=True)
if cmds.listRelatives(node, parent=True):
cmds.parent(node, world=True)
holding_sets = cmds.listSets(object=placeholder.scene_identifier)
if not holding_sets: