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/96-BM_DaVinci_Resolve_host_R_D

Browse source
This commit is contained in:
Jakub Jezek 2020-06-02 14:44:45 +02:00
commit 791b13231d
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3
442 changed files with 773 additions and 590 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pype/hooks/premiere/prelaunch.py
View file

@ -1,8 +1,8 @@
import os
import traceback
from pype.lib import PypeHook
from pypeapp import Logger
from pype.premiere import lib as prlib
from pype.api import Logger
from pype.hosts.premiere import lib as prlib
class PremierePrelaunch(PypeHook):
@ -27,7 +27,7 @@ class PremierePrelaunch(PypeHook):
env = os.environ
try:
__import__("pype.premiere")
__import__("pype.hosts.premiere")
__import__("pyblish")
except ImportError as e:

4
pype/hooks/unreal/unreal_prelaunch.py
View file

@ -2,8 +2,8 @@ import logging
import os
from pype.lib import PypeHook
from pype.unreal import lib as unreal_lib
from pypeapp import Logger
from pype.hosts.unreal import lib as unreal_lib
from pype.api import Logger
log = logging.getLogger(__name__)