Commit graph

14 commits

Author SHA1 Message Date
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
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
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
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