Nuke: fixing merge conflict fixes!! ;)

This commit is contained in:
Jakub Jezek 2021-04-06 16:17:04 +02:00
parent 36f08f595f
commit 168d6a931d
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3
3 changed files with 38 additions and 41 deletions

View file

@ -1,14 +1,12 @@
import os
import sys
import nuke
import avalon.api
import pyblish.api
from pype.api import Logger
from openpype.api import Logger
import openpype
from . import lib, menu
log = Logger().get_logger(__name__)
log = openpype.api.Logger().get_logger(__name__)
AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype")
HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.nuke.__file__))

View file

@ -1,15 +1,14 @@
{
"general": {
"open_workfile_at_start": false,
"create_initial_workfile": true
},
"menu": {
"create": "ctrl+shift+alt+c",
"publish": "ctrl+alt+p",
"load": "ctrl+alt+l",
"manage": "ctrl+alt+m",
"build_workfile": "ctrl+alt+b"
}
},
"open_workfile_at_start": false,
"create_initial_workfile": true
},
"create": {
"CreateWriteRender": {

View file

@ -11,6 +11,39 @@
"key": "general",
"label": "General",
"children": [
{
"type": "dict",
"collapsible": true,
"key": "menu",
"label": "OpenPype Menu shortcuts",
"children": [
{
"type": "text",
"key": "create",
"label": "Create..."
},
{
"type": "text",
"key": "publish",
"label": "Publish..."
},
{
"type": "text",
"key": "load",
"label": "Load..."
},
{
"type": "text",
"key": "manage",
"label": "Manage..."
},
{
"type": "text",
"key": "build_workfile",
"label": "Build Workfile"
}
]
},
{
"type": "boolean",
"key": "open_workfile_at_start",
@ -23,39 +56,6 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "menu",
"label": "OpenPype Menu shortcuts",
"children": [
{
"type": "text",
"key": "create",
"label": "Create..."
},
{
"type": "text",
"key": "publish",
"label": "Publish..."
},
{
"type": "text",
"key": "load",
"label": "Load..."
},
{
"type": "text",
"key": "manage",
"label": "Manage..."
},
{
"type": "text",
"key": "build_workfile",
"label": "Build Workfile"
}
]
},
{
"type": "dict",
"collapsible": true,