mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into enhancement/enhancement_on_reset_frame_range_function
This commit is contained in:
commit
5e2e99ebf7
2 changed files with 5 additions and 5 deletions
|
|
@ -496,9 +496,9 @@ def object_transform_set(container_children):
|
||||||
"""
|
"""
|
||||||
transform_set = {}
|
transform_set = {}
|
||||||
for node in container_children:
|
for node in container_children:
|
||||||
name = f"{node.name}.transform"
|
name = f"{node}.transform"
|
||||||
transform_set[name] = node.pos
|
transform_set[name] = node.pos
|
||||||
name = f"{node.name}.scale"
|
name = f"{node}.scale"
|
||||||
transform_set[name] = node.scale
|
transform_set[name] = node.scale
|
||||||
return transform_set
|
return transform_set
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ class MaxSceneLoader(load.LoaderPlugin):
|
||||||
)
|
)
|
||||||
for max_obj, obj_name in zip(max_objects, max_object_names):
|
for max_obj, obj_name in zip(max_objects, max_object_names):
|
||||||
max_obj.name = f"{namespace}:{obj_name}"
|
max_obj.name = f"{namespace}:{obj_name}"
|
||||||
max_container.append(rt.getNodeByName(max_obj.name))
|
max_container.append(max_obj)
|
||||||
return containerise(
|
return containerise(
|
||||||
name, max_container, context,
|
name, max_container, context,
|
||||||
namespace, loader=self.__class__.__name__)
|
namespace, loader=self.__class__.__name__)
|
||||||
|
|
@ -158,11 +158,11 @@ class MaxSceneLoader(load.LoaderPlugin):
|
||||||
current_max_object_names):
|
current_max_object_names):
|
||||||
max_obj.name = f"{namespace}:{obj_name}"
|
max_obj.name = f"{namespace}:{obj_name}"
|
||||||
max_objects.append(max_obj)
|
max_objects.append(max_obj)
|
||||||
max_transform = f"{max_obj.name}.transform"
|
max_transform = f"{max_obj}.transform"
|
||||||
if max_transform in transform_data.keys():
|
if max_transform in transform_data.keys():
|
||||||
max_obj.pos = transform_data[max_transform] or 0
|
max_obj.pos = transform_data[max_transform] or 0
|
||||||
max_obj.scale = transform_data[
|
max_obj.scale = transform_data[
|
||||||
f"{max_obj.name}.scale"] or 0
|
f"{max_obj}.scale"] or 0
|
||||||
|
|
||||||
update_custom_attribute_data(node, max_objects)
|
update_custom_attribute_data(node, max_objects)
|
||||||
lib.imprint(container["instance_node"], {
|
lib.imprint(container["instance_node"], {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue