Merge branch 'enhancement/fusion_switch_asset_task_paths' of https://github.com/BigRoy/ayon-core into enhancement/fusion_switch_asset_task_paths

This commit is contained in:
Roy Nieterau 2024-04-04 01:43:33 +02:00
commit 127acdddee
3 changed files with 25 additions and 23 deletions

View file

@ -240,10 +240,10 @@ def get_previous_loaded_object(container: str):
node_list(list): list of nodes which are previously loaded
"""
node_list = []
sel_list = rt.getProperty(container.modifiers[0].openPypeData, "sel_list")
for obj in rt.Objects:
if str(obj) in sel_list:
node_list.append(obj)
node_transform_monitor_list = rt.getProperty(
container.modifiers[0].openPypeData, "all_handles")
for node_transform_monitor in node_transform_monitor_list:
node_list.append(node_transform_monitor.node)
return node_list

View file

@ -2515,7 +2515,7 @@ def get_fps_for_current_context():
def get_frame_range(include_animation_range=False):
"""Get the current folder frame range and handles.
"""Get the current task frame range and handles.
Args:
include_animation_range (bool, optional): Whether to include
@ -2523,25 +2523,34 @@ def get_frame_range(include_animation_range=False):
range of the timeline. It is excluded by default.
Returns:
dict: Folder's expected frame range values.
dict: Task's expected frame range values.
"""
# Set frame start/end
project_name = get_current_project_name()
folder_path = get_current_folder_path()
folder_entity = ayon_api.get_folder_by_path(project_name, folder_path)
folder_attributes = folder_entity["attrib"]
task_name = get_current_task_name()
frame_start = folder_attributes.get("frameStart")
frame_end = folder_attributes.get("frameEnd")
folder_entity = ayon_api.get_folder_by_path(
project_name,
folder_path,
fields={"id"})
task_entity = ayon_api.get_task_by_name(
project_name, folder_entity["id"], task_name
)
task_attributes = task_entity["attrib"]
frame_start = task_attributes.get("frameStart")
frame_end = task_attributes.get("frameEnd")
if frame_start is None or frame_end is None:
cmds.warning("No edit information found for '{}'".format(folder_path))
return
handle_start = folder_attributes.get("handleStart") or 0
handle_end = folder_attributes.get("handleEnd") or 0
handle_start = task_attributes.get("handleStart") or 0
handle_end = task_attributes.get("handleEnd") or 0
frame_range = {
"frameStart": frame_start,
@ -2555,14 +2564,10 @@ def get_frame_range(include_animation_range=False):
# Some usages of this function use the full dictionary to define
# instance attributes for which we want to exclude the animation
# keys. That is why these are excluded by default.
task_name = get_current_task_name()
settings = get_project_settings(project_name)
task_entity = ayon_api.get_task_by_name(
project_name, folder_entity["id"], task_name
)
task_type = None
if task_entity:
task_type = task_entity["taskType"]
task_type = task_entity["taskType"]
include_handles_settings = settings["maya"]["include_handles"]

View file

@ -201,7 +201,7 @@ def get_current_project_settings():
Project name should be stored in environment variable `AYON_PROJECT_NAME`.
This function should be used only in host context where environment
variable must be set and should not happen that any part of process will
change the value of the enviornment variable.
change the value of the environment variable.
"""
project_name = os.environ.get("AYON_PROJECT_NAME")
if not project_name:
@ -209,6 +209,3 @@ def get_current_project_settings():
"Missing context project in environemt variable `AYON_PROJECT_NAME`."
)
return get_project_settings(project_name)