Commit graph

30 commits

Author SHA1 Message Date
Jakub Jezek
d5e4c1ee0c
Hiero: otio export finishing 2021-04-08 18:56:02 +02:00
Jakub Jezek
7d8457d7f9
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-08 18:28:38 +02:00
Jakub Jezek
2890a5fcbc
Hiero: otio publishing workflow wip 2021-04-08 16:30:13 +02:00
Milan Kolar
69ce0a8194
Merge pull request #1270 from pypeclub/fix/AE_highlight_comp_render
Fix clean up of composition must propagate to instance
2021-04-08 13:49:52 +02:00
Jakub Jezek
0a23208381
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-08 11:10:11 +02:00
Jakub Jezek
5d64ed22a2
remains of unrenamed pype. namespace 2021-04-08 11:01:54 +02:00
Jakub Jezek
6c27152eeb
Hiero: otio-workflow wip 2021-04-08 10:52:15 +02:00
Milan Kolar
39f5103d4e
Merge pull request #1274 from pypeclub/fix/AE_remove_orphaned_instances
AE remove orphaned instance from workfile
2021-04-08 09:58:40 +02:00
Petr Kalis
811d559716 AE remove orphaned instance from workfile
Orphaned instance points to composition that doesn't exist anymore. Delete that instance, log warning
2021-04-07 16:01:15 +02:00
Milan Kolar
43163e500d
Merge pull request #1238 from pypeclub/feature/app_group_in_name
App group in application full name
2021-04-07 13:49:22 +02:00
Petr Kalis
fb16f1e7e1 Fix clean up of composition must propagate to instance 2021-04-07 13:45:00 +02:00
Jakub Jezek
1ab3fb3953
Merge branch 'develop' into feature/1235-hiero-unify-otio-workflow-from-resolve 2021-04-07 13:26:41 +02:00
Jakub Jezek
f3c24ac0d2
Hiero: Creator minimum value to 0 2021-04-07 13:10:29 +02:00
Milan Kolar
30fca34643
Merge pull request #1165 from pypeclub/3.0/feature/1070-nuke-workfile-template
Nuke: workfile template
2021-04-07 12:47:17 +02:00
Jakub Jezek
8b157de9c3
Hiero: fixing AttributeError when nothing selected
or wrong context of selection
2021-04-07 12:17:36 +02:00
Jakub Jezek
92ae62004d
Hiero, Global: fixing after transition merge 2021-04-07 11:12:18 +02:00
Jakub Jezek
168d6a931d
Nuke: fixing merge conflict fixes!! ;) 2021-04-06 16:17:04 +02:00
Jakub Jezek
36f08f595f
Nuke: merging openpype and fixing the merge 2021-04-06 15:42:52 +02:00
iLLiCiTiT
eb67227420 removed AVALON_HIERARCHY and AVALON_PROJECTCODE from celaction 2021-04-06 14:45:33 +02:00
Jakub Jezek
40fe1ba76a
Hiero: Solving Merge conflicts 2021-04-06 13:32:00 +02:00
Jakub Jezek
e8d00b5f3c
Merge branch 'develop' into 3.0/bugfix/hiero-functionality-issues 2021-04-06 13:23:14 +02:00
iLLiCiTiT
9a6792ffab Merge branch 'develop' into backup/app_group_in_name
# Conflicts:
#	openpype/lib/applications.py
#	pype/hosts/premiere/extensions/com.pype/jsx/pype.jsx
2021-04-06 11:16:56 +02:00
Petr Kalis
81ef4334ad AE - clean up signature for rename_item 2021-04-02 14:20:49 +02:00
Petr Kalis
026c732474 AE - fix unicode icon in composition name
Unicode characters causes an issue on specific rendering environments, clean it up for safety.
2021-04-02 14:17:44 +02:00
Milan Kolar
785d529b39
Merge branch 'develop' into host-openpype-chasing 2021-04-01 21:54:32 +02:00
Milan Kolar
6e21cdea3d blender and houdini imports 2021-04-01 21:48:57 +02:00
Milan Kolar
bf6940c415 unreal, tv paint and harmony imports 2021-04-01 21:48:46 +02:00
Milan Kolar
d70ffbd384 fix maya string imports 2021-04-01 21:48:18 +02:00
iLLiCiTiT
304a6a94fd fix string imports 2021-04-01 19:10:29 +02:00
Milan Kolar
8432e94615 rename folder 2021-04-01 18:54:46 +02:00