Roy Nieterau
7b7085fe0c
Merge remote-tracking branch 'upstream/develop' into fusion_new_publisher
2022-09-20 23:19:17 +02:00
Petr Kalis
c22bcbf446
Merge pull request #3854 from pypeclub/feature/OP-3940_Photoshop-workfile-version-corresponds-with-render-version
...
Photoshop: synchronize image version with workfile
2022-09-20 11:36:42 +02:00
Roy Nieterau
df330e1002
Update defaults for Fusion environment
2022-09-19 18:07:24 +02:00
Roy Nieterau
b36e1ded7d
Set default image format for V-Ray+Redshift to exr instead of png and iff
2022-09-17 13:29:38 +02:00
Roy Nieterau
508b17963d
Move Fusion OCIO settings out of anatomy into project settings
2022-09-16 15:41:16 +02:00
Jakub Trllo
f24925dfd2
resaved default settings to add missing values
2022-09-16 14:21:52 +02:00
Petr Kalis
bb6c881760
OP-3940 - renamed sync_workfile_version to enabled
2022-09-16 11:15:25 +02:00
Jakub Trllo
8c78edb4ac
Merge pull request #3810 from moonyuet/OP#3747/Feature-lock-task-workfiles-when-users-are-working-on-them
...
General: lock task workfiles when they are working on
2022-09-16 10:03:11 +02:00
Roy Nieterau
cd40fab99f
Add Fusion 18 application to defaults
2022-09-16 00:01:41 +02:00
Roy Nieterau
0e4a73f680
Fusion: Set OCIO project setting and set OCIO env var on launch
...
(cherry picked from commit 8e9a7200d35ab7cba174855acfe03794936125cf)
2022-09-15 23:57:44 +02:00
Petr Kalis
d905740208
OP-3940 - collector cannot be optional
2022-09-15 12:18:07 +02:00
Petr Kalis
d0b8437cfd
OP-3940 - added optionality to collector
...
There might be a reason when artist would like to skip this synchronization for specific workfile.
2022-09-14 18:32:08 +02:00
Petr Kalis
3703ec07bc
OP-3940 - introduced new Settings for CollectVersion for Photoshop
2022-09-14 18:23:17 +02:00
Roy Nieterau
a0333c88ae
Remove unused PanZoom / pan_zoom settings
2022-09-14 17:23:59 +02:00
Roy Nieterau
730f451020
Revert "Fix Width label"
...
This reverts commit 95fef2c4b1
2022-09-14 16:57:11 +02:00
Roy Nieterau
e16f5df4d7
Update defaults for the removed settings
2022-09-14 16:53:04 +02:00
Roy Nieterau
ee4b9056fe
Fix incorrectly resolved merge conflict
2022-09-14 16:51:59 +02:00
Roy Nieterau
1e27e9b71f
Remove unused settings
2022-09-14 16:50:50 +02:00
Roy Nieterau
95fef2c4b1
Fix Width label
2022-09-14 16:50:32 +02:00
Roy Nieterau
aef2b79d97
Merge branch 'maya_playblast_capture_hud' into maya_extract_playblast_texture_settings
...
# Conflicts:
# openpype/settings/defaults/project_settings/maya.json
# openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
2022-09-14 16:32:11 +02:00
Roy Nieterau
f501dac15f
Fix default settings for new viewport options settings
2022-09-14 16:14:18 +02:00
Roy Nieterau
9b9bfdadb9
Uppercase percent label like the surrounding labels
2022-09-14 16:05:10 +02:00
Roy Nieterau
522d1e2df8
Labelize Camera options to match with Camera attributes in Attribute Editor
2022-09-14 16:04:09 +02:00
Roy Nieterau
fd4648c9bd
Add label
2022-09-14 15:47:43 +02:00
Roy Nieterau
c6bd26485d
Sort a bit more by Label again so that NURBS options are together + fix label for handles
2022-09-14 15:35:12 +02:00
Roy Nieterau
8e068308c6
Add Display Textures settings correctly, labelize the Show settings to clarify what they are
2022-09-14 15:30:46 +02:00
Roy Nieterau
1c6b23b674
Fix headsUpDisplay key name
...
Capture has a default setting named `headsUpDisplay` which is the long name for the setting `hud`. Thus when supplying `hud` as viewport option then `capture` will merge the key-values and thus will try to set both `headsUpDisplay` and `hud` value for the modelEditor which ends up ignoring `hud` and instead applying the `headsUpDisplay`.
Thus, `hud` didn't do anything.
2022-09-14 13:50:57 +02:00
Ondřej Samohel
e78e989c33
Merge pull request #3652 from quadproduction/120-create-shelf-manager
...
Houdini: Shelf Manager
2022-09-14 12:56:28 +02:00
Kayla Man
0ac3cacc35
adding a Qt lockfile dialog for lockfile tasks
2022-09-14 12:35:59 +08:00
Jakub Trllo
4a5e0afbfe
Merge pull request #3820 from BigRoy/fix_mayaascii_family_name_defaults
...
Maya+Ftrack: Change typo in family name `mayaascii` -> `mayaAscii`
2022-09-13 16:23:59 +02:00
Jakub Trllo
fc4368a40d
Merge pull request #3790 from moonyuet/OP-1959handling-mel-workspace-in-Maya
...
Maya: Workspace mel loaded from settings
2022-09-13 10:27:29 +02:00
Thomas Fricard
e47a6ce5d3
Merge branch 'develop' into 120-create-shelf-manager
2022-09-12 11:24:55 +02:00
Jakub Trllo
df1cccf258
Merge branch 'develop' into feature/OP-3842_Change-publish-template-settings-location
2022-09-12 11:24:52 +02:00
Kayla Man
e612736065
adding and loading mel workspace within openpype settings
2022-09-12 16:37:16 +08:00
Roy Nieterau
d0665c3928
Change mayaascii -> mayaAscii
2022-09-09 13:06:12 +02:00
Kayla Man
26ae84df16
adding lock task workfiles when users are working on them
2022-09-09 13:20:49 +08:00
Jakub Jezek
d7a768f718
turn plugin off by default
2022-09-08 15:51:24 +02:00
Jakub Jezek
7668fb830c
Merge branch 'develop' into feature/global-collect-audio-plugin
2022-09-08 15:39:40 +02:00
Jakub Trllo
b960f82324
Merge pull request #3739 from Tilix4/ch_drop_entities_root_setting
...
Kitsu|Change: Drop 'entities root' setting.
2022-09-07 15:39:47 +02:00
Kayla Man
d4eeabad7e
adding and loading maya mel workspace through openpype project setting
2022-09-07 21:17:49 +08:00
Kayla Man
decc112518
load and edit mel workspace within the Openpype project settings
2022-09-07 17:06:47 +08:00
Kayla Man
a9b69536ca
adding and loading maya mel workspace through openpype project setting
2022-09-07 16:44:29 +08:00
Kayla Man
26fbdac8da
adding and loading maya mel workspace through openpype project setting
2022-09-07 16:14:30 +08:00
Jakub Trllo
965a1d8f61
Merge branch 'develop' into feature/OP-3842_Change-publish-template-settings-location
2022-09-06 17:25:53 +02:00
Kayla Man
b88def9aea
adding and loading maya mel workspace through openpype project setting
2022-09-05 19:40:30 +08:00
Kayla Man
d9a150022e
adding and loading maya mel workspace through openpype project setting
2022-09-05 19:28:48 +08:00
Jakub Trllo
1d5e691daf
Merge pull request #3763 from pypeclub/feature/OP-3851_Update-nuke-template-build
...
Nuke: Build workfile by template
2022-09-02 15:41:38 +02:00
Jakub Trllo
141735dad8
Merge branch 'develop' into feature/OP-3842_Change-publish-template-settings-location
2022-08-31 18:24:15 +02:00
murphy
c6b8b91825
Ftrack status fix typo prgoress -> progress
...
there is a typo in status name in settings prgoress -> progress
2022-08-30 18:06:19 +02:00
Jakub Trllo
e07fdf2e91
added settings for nuke
2022-08-30 17:48:46 +02:00
