Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Substance Painter: Add support for sync workfile version #590

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
66df4fc
add sync workfile version into substance painter
moonyuet Jun 4, 2024
d1951f3
bump addons version
moonyuet Jun 4, 2024
c97c984
follow workfile version exists in creator's tab
moonyuet Jun 4, 2024
7c254b8
rename collect current file to current_context_data
moonyuet Jun 4, 2024
7fd7512
Update package.py
moonyuet Jun 4, 2024
8403e2f
follow workfile version can only be enabled through the ayon project …
moonyuet Jun 5, 2024
b55ead0
remove the duplicated collect verion
moonyuet Jun 5, 2024
dd99516
move the workfile version collector into general publish plugins
moonyuet Jun 5, 2024
829e411
add follow workfile version in substance paitner ayon project setting
moonyuet Jun 5, 2024
8f00b72
The name of the follow workfile version should be follow workfile ver…
moonyuet Jun 5, 2024
b789aa7
restore the creator logic
moonyuet Jun 5, 2024
5e9b974
restore the creator logic
moonyuet Jun 5, 2024
1b84b39
add substance painter host into collect scene version
moonyuet Jun 7, 2024
b246ce9
Merge branch 'develop' into enhancement/AY-5648_Substance-work--publi…
moonyuet Jun 7, 2024
7676724
remove the duplicated version collector
moonyuet Jun 7, 2024
6baecb8
not adding create texture into the changes
moonyuet Jun 7, 2024
5970a75
not adding create texture into the changes
moonyuet Jun 7, 2024
f3a6d37
Update client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
moonyuet Jun 7, 2024
8218821
Merge branch 'develop' into enhancement/AY-5648_Substance-work--publi…
moonyuet Jun 7, 2024
91c5866
Merge branch 'develop' into enhancement/AY-5648_Substance-work--publi…
moonyuet Jun 10, 2024
bb57e76
resolve conflict
moonyuet Jun 10, 2024
1450ccb
Merge branch 'develop' into enhancement/AY-5648_Substance-work--publi…
moonyuet Jun 11, 2024
9f26718
Merge branch 'develop' into enhancement/AY-5648_Substance-work--publi…
moonyuet Jun 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,14 @@ def fill_anatomy_data(self, context):

# Define version
version_number = None
if self.follow_workfile_version:

# Allow an instance to force enable or disable the version
# following of the current context
use_context_version = self.follow_workfile_version
if "followWorkfileVersion" in instance.data:
use_context_version = instance.data["followWorkfileVersion"]

if use_context_version:
version_number = context.data("version")

# Even if 'follow_workfile_version' is enabled, it may not be set
Expand Down
3 changes: 2 additions & 1 deletion client/ayon_core/plugins/publish/collect_scene_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
"photoshop",
"resolve",
"tvpaint",
"motionbuilder"
"motionbuilder",
"substancepainter"
]

# in some cases of headless publishing (for example webpublisher using PS)
Expand Down
4 changes: 3 additions & 1 deletion server/settings/publish_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,8 @@ class PublishPuginsModel(BaseSettingsModel):
"nuke",
"photoshop",
"resolve",
"tvpaint"
"tvpaint",
"substancepainter"
],
"skip_hosts_headless_publish": []
},
Expand All @@ -890,6 +891,7 @@ class PublishPuginsModel(BaseSettingsModel):
"maya",
"nuke",
"photoshop",
"substancepainter"
],
"enabled": True,
"optional": False,
Expand Down