Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/validation_exceptions

Browse source
This commit is contained in:
Jakub Trllo 2022-03-01 11:37:44 +01:00
commit 467208309b
1390 changed files with 101845 additions and 399516 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/hosts/harmony/plugins/create/create_farm_render.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Create Composite node for render on farm."""
from avalon import harmony
import openpype.hosts.harmony.api as harmony
from openpype.hosts.harmony.api import plugin

2
openpype/hosts/harmony/plugins/create/create_render.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Create render node."""
from avalon import harmony
import openpype.hosts.harmony.api as harmony
from openpype.hosts.harmony.api import plugin

3
openpype/hosts/harmony/plugins/load/load_audio.py
View file

@ -1,4 +1,5 @@
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
sig = harmony.signature()
func = """

19
openpype/hosts/harmony/plugins/load/load_background.py
View file

@ -1,7 +1,8 @@
import os
import json
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
import openpype.lib
@ -13,11 +14,11 @@ copy_files = """function copyFile(srcFilename, dstFilename)
}
"""
import_files = """var PNGTransparencyMode = 1; //Premultiplied wih Black
var TGATransparencyMode = 0; //Premultiplied wih Black
var SGITransparencyMode = 0; //Premultiplied wih Black
import_files = """var PNGTransparencyMode = 1; //Premultiplied with Black
var TGATransparencyMode = 0; //Premultiplied with Black
var SGITransparencyMode = 0; //Premultiplied with Black
var LayeredPSDTransparencyMode = 1; //Straight
var FlatPSDTransparencyMode = 2; //Premultiplied wih White
var FlatPSDTransparencyMode = 2; //Premultiplied with White
function getUniqueColumnName( column_prefix )
{
@ -140,11 +141,11 @@ function import_files(args)
import_files
"""
replace_files = """var PNGTransparencyMode = 1; //Premultiplied wih Black
var TGATransparencyMode = 0; //Premultiplied wih Black
var SGITransparencyMode = 0; //Premultiplied wih Black
replace_files = """var PNGTransparencyMode = 1; //Premultiplied with Black
var TGATransparencyMode = 0; //Premultiplied with Black
var SGITransparencyMode = 0; //Premultiplied with Black
var LayeredPSDTransparencyMode = 1; //Straight
var FlatPSDTransparencyMode = 2; //Premultiplied wih White
var FlatPSDTransparencyMode = 2; //Premultiplied with White
function replace_files(args)
{

3
openpype/hosts/harmony/plugins/load/load_imagesequence.py
View file

@ -6,7 +6,8 @@ from pathlib import Path
import clique
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
import openpype.lib

7
openpype/hosts/harmony/plugins/load/load_palette.py
View file

@ -1,7 +1,8 @@
import os
import shutil
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
class ImportPaletteLoader(api.Loader):
@ -41,7 +42,9 @@ class ImportPaletteLoader(api.Loader):
harmony.save_scene()
msg = "Updated {}.".format(subset_name)
msg += " You need to reload the scene to see the changes."
msg += " You need to reload the scene to see the changes.\n"
msg += "Please save workfile when ready and use Workfiles "
msg += "to reopen it."
harmony.send(
{

3
openpype/hosts/harmony/plugins/load/load_template.py
View file

@ -6,7 +6,8 @@ import os
import shutil
import uuid
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
import openpype.lib

3
openpype/hosts/harmony/plugins/load/load_template_workfile.py
View file

@ -3,7 +3,8 @@ import zipfile
import os
import shutil
from avalon import api, harmony
from avalon import api
import openpype.hosts.harmony.api as harmony
class ImportTemplateLoader(api.Loader):

2
openpype/hosts/harmony/plugins/publish/collect_current_file.py
View file

@ -3,7 +3,7 @@
import os
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class CollectCurrentFile(pyblish.api.ContextPlugin):

4
openpype/hosts/harmony/plugins/publish/collect_farm_render.py
View file

@ -3,9 +3,10 @@
from pathlib import Path
import attr
from avalon import harmony, api
from avalon import api
import openpype.lib.abstract_collect_render
import openpype.hosts.harmony.api as harmony
from openpype.lib.abstract_collect_render import RenderInstance
import openpype.lib
@ -176,6 +177,7 @@ class CollectFarmRender(openpype.lib.abstract_collect_render.
ignoreFrameHandleCheck=True
)
render_instance.context = context
self.log.debug(render_instance)
instances.append(render_instance)

2
openpype/hosts/harmony/plugins/publish/collect_instances.py
View file

@ -3,7 +3,7 @@
import json
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class CollectInstances(pyblish.api.ContextPlugin):

2
openpype/hosts/harmony/plugins/publish/collect_palettes.py
View file

@ -5,7 +5,7 @@ import json
import re
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class CollectPalettes(pyblish.api.ContextPlugin):

2
openpype/hosts/harmony/plugins/publish/collect_scene.py
View file

@ -3,7 +3,7 @@
import os
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class CollectScene(pyblish.api.ContextPlugin):

2
openpype/hosts/harmony/plugins/publish/extract_palette.py
View file

@ -5,7 +5,7 @@ import csv
from PIL import Image, ImageDraw, ImageFont
from avalon import harmony
import openpype.hosts.harmony.api as harmony
import openpype.api

2
openpype/hosts/harmony/plugins/publish/extract_render.py
View file

@ -3,7 +3,7 @@ import tempfile
import subprocess
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
import openpype.lib
import clique

2
openpype/hosts/harmony/plugins/publish/extract_save_scene.py
View file

@ -1,5 +1,5 @@
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class ExtractSaveScene(pyblish.api.ContextPlugin):

2
openpype/hosts/harmony/plugins/publish/extract_template.py
View file

@ -4,7 +4,7 @@ import os
import shutil
import openpype.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
import openpype.hosts.harmony

2
openpype/hosts/harmony/plugins/publish/increment_workfile.py
View file

@ -3,7 +3,7 @@ import os
import pyblish.api
from openpype.action import get_errored_plugins_from_data
from openpype.lib import version_up
from avalon import harmony
import openpype.hosts.harmony.api as harmony
class IncrementWorkfile(pyblish.api.InstancePlugin):

2
openpype/hosts/harmony/plugins/publish/validate_audio.py
View file

@ -2,7 +2,7 @@ import os
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony.api as harmony
from openpype.pipeline import PublishXmlValidationError

3
openpype/hosts/harmony/plugins/publish/validate_instances.py
View file

@ -3,8 +3,8 @@ import os
from avalon import harmony
import pyblish.api
import openpype.api
from openpype.pipeline import PublishXmlValidationError
import openpype.hosts.harmony.api as harmony
class ValidateInstanceRepair(pyblish.api.Action):
@ -55,4 +55,3 @@ class ValidateInstance(pyblish.api.InstancePlugin):
if instance_asset != current_asset:
raise PublishXmlValidationError(self, msg,
formatting_data=formatting_data)

10
openpype/hosts/harmony/plugins/publish/validate_scene_settings.py
View file

@ -6,9 +6,7 @@ import re
import pyblish.api
from avalon import harmony
import openpype.hosts.harmony
import openpype.hosts.harmony.api as harmony
from openpype.pipeline import PublishXmlValidationError
@ -21,12 +19,12 @@ class ValidateSceneSettingsRepair(pyblish.api.Action):
def process(self, context, plugin):
"""Repair action entry point."""
expected = openpype.hosts.harmony.api.get_asset_settings()
expected = harmony.get_asset_settings()
asset_settings = _update_frames(dict.copy(expected))
asset_settings["frameStart"] = 1
asset_settings["frameEnd"] = asset_settings["frameEnd"] + \
asset_settings["handleEnd"]
openpype.hosts.harmony.api.set_scene_settings(asset_settings)
harmony.set_scene_settings(asset_settings)
if not os.path.exists(context.data["scenePath"]):
self.log.info("correcting scene name")
scene_dir = os.path.dirname(context.data["currentFile"])
@ -57,7 +55,7 @@ class ValidateSceneSettings(pyblish.api.InstancePlugin):
def process(self, instance):
"""Plugin entry point."""
expected_settings = openpype.hosts.harmony.api.get_asset_settings()
expected_settings = harmony.get_asset_settings()
self.log.info("scene settings from DB:".format(expected_settings))
expected_settings = _update_frames(dict.copy(expected_settings))