Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 0d060a7
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Mon Dec 20 11:58:49 2021 +0100

    Add option to publish from published workfile

commit 40ed1de
Merge: 373217b 512bf2e
Author: pypebot <82967070+pypebot@users.noreply.github.com>
Date:   Wed Dec 15 04:41:41 2021 +0100

    [Automated] Merged main into develop

commit 512bf2e
Author: OpenPype <info@openpype.io>
Date:   Wed Dec 15 03:41:30 2021 +0000

    [Automated] Bump version

commit 39bddac
Merge: ea03444 373217b
Author: pypebot <82967070+pypebot@users.noreply.github.com>
Date:   Wed Dec 15 04:35:02 2021 +0100

    [Automated] Merged develop into main

commit 373217b
Merge: 897fa65 00b1430
Author: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date:   Tue Dec 14 18:03:57 2021 +0100

    Merge pull request ynput#2404 from pypeclub/feature/OP-1165_Sync-to-avalon-does-not-check-existence-of-entity-type

    Ftrack: Check existence of object type on recreation

commit 897fa65
Merge: d69d8f3 c4106bf
Author: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date:   Tue Dec 14 18:03:46 2021 +0100

    Merge pull request ynput#2399 from pypeclub/bugfix/placeholder_palette_change_fix

    Fix: Placeholder Input color set fix

commit d69d8f3
Merge: a4be22c 0b6e2f3
Author: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date:   Tue Dec 14 18:03:37 2021 +0100

    Merge pull request ynput#2377 from pypeclub/feature/OP-2092_Blender-30-OP-is-not-integrated

    Blender 3: Support auto install for new blender version

commit a4be22c
Merge: b8fadc6 68b9939
Author: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date:   Tue Dec 14 17:34:22 2021 +0100

    Merge pull request ynput#2382 from pypeclub/feature/OP-2001_Settings-Copypaste-project-settings-to-another-project

    Enhancement: Settings: Use project settings values from another project

commit 68b9939
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Tue Dec 14 15:35:39 2021 +0100

    modified message

commit b8fadc6
Merge: 1b6c551 2c66a1e
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:31:58 2021 +0100

    Merge pull request ynput#2387 from pypeclub/feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

    Add validator to check correct version of extension for PS and AE

commit 2c66a1e
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:31:03 2021 +0100

    OP-2053 - fix PS after merge

commit 450dbf3
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:29:42 2021 +0100

    OP-2053 - fix PS after merge

commit 0cd9502
Merge: 1cbcdba b97d79d
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:27:14 2021 +0100

    Merge remote-tracking branch 'origin/feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit 1cbcdba
Merge: 621118c ca7a92b
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:26:15 2021 +0100

    OP-2053 - merge develop

commit 1b6c551
Merge: ca7a92b a6a7348
Author: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date:   Tue Dec 14 15:23:43 2021 +0100

    Merge pull request ynput#2403 from pypeclub/bugfix/OP-1780_set_global_environments-fails-with-addons

    General: Fix access to environments from default settings

commit b97d79d
Merge: 61bf279 ca7a92b
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:19:53 2021 +0100

    Merge branch 'develop' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit ca7a92b
Merge: ad51cd8 b57a09b
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:17:36 2021 +0100

    Merge pull request ynput#2270 from pypeclub/feature/OP-2019_Create-test-publish-class-for-AE

    Create test publish class for After Effects

commit b57a09b
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:16:48 2021 +0100

    OP-2019 - revert unwanted commit

commit c0bacd5
Merge: 2e753e1 ad51cd8
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 15:13:34 2021 +0100

    OP-2019 - merge develop

commit ad51cd8
Merge: feefe11 9318965
Author: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Date:   Tue Dec 14 13:57:24 2021 +0100

    Merge pull request ynput#2356 from Ellipsanime/maya-ImagePlaneLoader-load-blueprint

    Maya: Add is_static_image_plane and is_in_all_views option in imagePlaneLoader

commit feefe11
Merge: d74ba7f 09bbeba
Author: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Date:   Tue Dec 14 13:52:07 2021 +0100

    Merge pull request ynput#2375 from Ellipsanime/maya-add-render-image-path-to-settings

    Maya add render image path to settings

commit d74ba7f
Merge: bfbd8bd c78d4d8
Author: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Date:   Tue Dec 14 13:49:57 2021 +0100

    Merge pull request ynput#2394 from Ellipsanime/CollectLook-fix-getattr

    [Fix][MAYA] Handle message type attribute within CollectLook

commit bfbd8bd
Merge: 3b9db7d ebbd43b
Author: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Date:   Tue Dec 14 13:46:50 2021 +0100

    Merge pull request ynput#2384 from pypeclub/enhancement/centos7-add-xcb-to-pyside2

    Centos 7 dependency compatibility

commit ebbd43b
Author: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Date:   Tue Dec 14 13:46:34 2021 +0100

    Update Dockerfile.centos7

    Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

commit 00b1430
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Tue Dec 14 11:48:55 2021 +0100

    check existence of entity type on recreation and use Folder if not found

commit 0ff12fd
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Tue Dec 14 11:48:23 2021 +0100

    cache object types

commit 61bf279
Merge: 621118c 3b9db7d
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:28:30 2021 +0100

    Merge branch 'develop' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit 621118c
Merge: b2644d3 02717fa
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:25:16 2021 +0100

    Merge remote-tracking branch 'origin/feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit b2644d3
Merge: aa232b4 8739dd9
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:23:44 2021 +0100

    Merge remote-tracking branch 'origin/feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit aa232b4
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:13:02 2021 +0100

    OP-2053 - fix counts in db_asserts

commit 02717fa
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:15:51 2021 +0100

    Update error msg format

    Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

commit 8739dd9
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 11:13:02 2021 +0100

    OP-2053 - fix counts in db_asserts

commit a6a7348
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Tue Dec 14 11:12:06 2021 +0100

    fix access to default settings in get_general_environments

commit 148bb47
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Tue Dec 14 10:54:10 2021 +0100

    OP-2053 - allow injection of AVALON_DB env var as a db

commit 0b6e2f3
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Mon Dec 6 12:24:02 2021 +0100

    modified version regex for installation of PySide2 into blender

commit c4106bf
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Mon Dec 13 14:01:28 2021 +0100

    set placeholder font color on initialization instead of after show

commit c78d4d8
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Mon Dec 13 10:45:30 2021 +0100

    Handle message type attribute

commit 09bbeba
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Fri Dec 10 15:14:03 2021 +0100

    Add settings to repair

commit a80ed0d
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Thu Dec 9 14:25:24 2021 +0100

    OP-2053 - Hound

commit 2673b58
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Thu Dec 9 14:01:28 2021 +0100

    OP-2053 - added possibility to check installed extension version

commit 2a540cd
Merge: 5dc2fd0 2e753e1
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Thu Dec 9 13:34:34 2021 +0100

    Merge branch 'feature/OP-2019_Create-test-publish-class-for-AE' into feature/OP-2053_Add-validator-to-check-correct-version-of-extension-for-PS-and-AE

commit 5dc2fd0
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Wed Dec 8 19:00:44 2021 +0100

    OP-2053 - bump down order of collector for current file

    It depends on valid extension

commit 97404ab
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Wed Dec 8 19:00:12 2021 +0100

    OP-2053 - added check of installed extension for PS

commit 6ed4db4
Author: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date:   Wed Dec 8 17:11:45 2021 +0100

    installand copy xcb libs to pyside2 inside openpype

commit 8e71919
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 13:25:22 2021 +0100

    skip action if does not have any projects which can be used as source for values

commit 8270f2f
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 13:07:57 2021 +0100

    catch exceptions happened during applying values from different project

commit c08b467
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 13:07:38 2021 +0100

    use defined constant for default project label

commit 2fdac86
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 13:00:07 2021 +0100

    initial version of applying settings from different project

commit e2f24fb
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 12:59:42 2021 +0100

    project category widget has ability to retrieve project names

commit 74b6da9
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 12:59:21 2021 +0100

    added method to return project names from project list

commit 347b8da
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 12:59:01 2021 +0100

    use working_state_context for current actions

commit b3d2d41
Author: iLLiCiTiT <jakub.trllo@gmail.com>
Date:   Wed Dec 8 12:58:37 2021 +0100

    added working state context to category widget

commit 7e04079
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Mon Dec 6 14:07:01 2021 +0100

    Update error message

commit ca1516f
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Mon Dec 6 10:45:22 2021 +0100

    Fix syntax

commit b3ec2fe
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Mon Dec 6 10:28:56 2021 +0100

    Use the setting in CollectRender

commit 89490f4
Author: Jérôme LORRAIN <jerome.lorrain@protonmail.com>
Date:   Fri Dec 3 17:22:27 2021 +0100

    add maya default render folder path to settings

commit 2e753e1
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Fri Dec 3 14:39:49 2021 +0100

    OP-2019 - fixes for db_asserts

commit 477d177
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Fri Dec 3 11:42:22 2021 +0100

    OP-2019 - fixes for PS test class

commit f9a1445
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Fri Dec 3 10:28:41 2021 +0100

    OP-2019 - revert to develop version

commit 07fdcc6
Author: Petr Kalis <petr.kalis@gmail.com>
Date:   Thu Dec 2 19:07:46 2021 +0100

    OP-2019 - fixed wrong value

commit 9318965
Author: clement.hector <clement.hector@gmail.com>
Date:   Thu Dec 2 12:34:34 2021 +0100

    add fileName in imagePlane cmd

commit 3c7b622
Author: clement.hector <clement.hector@gmail.com>
Date:   Thu Dec 2 11:53:32 2021 +0100

    fix rotation after detach

commit 3d6bf6e
Author: clement.hector <clement.hector@gmail.com>
Date:   Wed Dec 1 18:56:38 2021 +0100

    change option by options

commit 64c4e5f
Author: clement.hector <clement.hector@gmail.com>
Date:   Wed Dec 1 16:42:18 2021 +0100

    Add static and allView option in imagePlaneLoader
  • Loading branch information
jlorrain authored and ClementHector committed Jan 6, 2022
1 parent 12f222a commit 52a3637
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 4 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1685,4 +1685,3 @@ A large cleanup release. Most of the change are under the hood.




Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import pyblish.api
import openpype.api
from openpype.lib.profiles_filtering import filter_profiles


def is_subdir(path, root_dir):
Expand All @@ -25,7 +26,7 @@ def is_subdir(path, root_dir):
return True


class ValidateSceneSetWorkspace(pyblish.api.ContextPlugin):
class ValidateSceneSetWorkspace(pyblish.api.InstancePlugin):
"""Validate the scene is inside the currently set Maya workspace"""

order = openpype.api.ValidatePipelineOrder
Expand All @@ -34,8 +35,11 @@ class ValidateSceneSetWorkspace(pyblish.api.ContextPlugin):
version = (0, 1, 0)
label = 'Maya Workspace Set'

def process(self, context):
publish_from_published_workfiles = True

def process(self, instance):

context = instance.context
scene_name = cmds.file(query=True, sceneName=True)
if not scene_name:
raise RuntimeError("Scene hasn't been saved. Workspace can't be "
Expand All @@ -44,4 +48,31 @@ def process(self, context):
root_dir = cmds.workspace(query=True, rootDirectory=True)

if not is_subdir(scene_name, root_dir):
raise RuntimeError("Maya workspace is not set correctly.")

if not self.publish_from_published_workfiles:
raise RuntimeError("Maya workspace is not set correctly.")
else:
settings = context.data.get('project_settings')
template_name_profiles = settings.get('global') \
.get('publish') \
.get('IntegrateAssetNew') \
.get('template_name_profiles')
task_name = context.data["anatomyData"]["task"]["name"]
task_type = context.data["anatomyData"]["task"]["type"]
key_values = {
"families": "workfile",
"tasks": task_name,
"hosts": context.data["hostName"],
"task_types": task_type
}
profile = filter_profiles(
template_name_profiles,
key_values,
logger=self.log
)
anatomy = context.data.get('anatomy')
anatomy_filled = anatomy.format(instance.data.get('anatomyData'))
pub_workfile_path = anatomy_filled[profile["template_name"]]["folder"]

if not is_subdir(scene_name, pub_workfile_path):
raise RuntimeError("Maya workspace is not set correctly.")
3 changes: 3 additions & 0 deletions openpype/settings/defaults/project_settings/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"optional": false,
"active": true
},
"ValidateSceneSetWorkspace": {
"publish_from_published_workfiles": false
},
"ValidateIntent": {
"enabled": false,
"profiles": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,20 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ValidateSceneSetWorkspace",
"label": "Validate Workspace",
"is_group": true,
"children": [
{
"type": "boolean",
"key": "publish_from_published_workfiles",
"label": "Allow publishing form published workfiles"
}
]
},
{
"type": "dict",
"label": "Validate Intent",
Expand Down

0 comments on commit 52a3637

Please sign in to comment.