Merge branch 'hotfix/harmony_resolution_task_filter'

This commit is contained in:
Milan Kolar 2020-10-05 12:46:33 +02:00
commit df5db0fbf0

View file

@ -7,6 +7,7 @@ from avalon.vendor import Qt
import avalon.tools.sceneinventory
import pyblish.api
from pype import lib
from pype.api import config
signature = str(uuid4())
@ -53,7 +54,7 @@ def get_asset_settings():
resolution_width = asset_data.get("resolutionWidth")
resolution_height = asset_data.get("resolutionHeight")
return {
scene_data = {
"fps": fps,
"frameStart": frame_start,
"frameEnd": frame_end,
@ -61,6 +62,15 @@ def get_asset_settings():
"resolutionHeight": resolution_height
}
harmony_config = config.get_presets().["harmony"]["general"]
skip_resolution_check = harmony_config.get(["skip_resolution_check"], [])
if os.getenv('AVALON_TASK') in skip_resolution_check:
scene_data.pop("resolutionWidth")
scene_data.pop("resolutionHeight")
return scene_data
def ensure_scene_settings():
settings = get_asset_settings()