13 commits

Author	SHA1	Message	Date
Jakub Jezek	d503395818	resolve: fix transition merge	2021-04-07 10:43:36 +02:00
Jakub Jezek	9a0f20ef95	Resolve: adding correct ux convention to menu	2021-04-06 15:15:02 +02:00
Jakub Jezek	e46c3a9fa7	Resolve: updating menu to disable unwritten features	2021-04-06 15:13:03 +02:00
Jakub Jezek	9228508dff	Resolve: merge openpype fixes	2021-04-06 15:11:00 +02:00
Jakub Jezek	f74bf468e0	Merge branch 'develop' into feature/916-resolve-instance-manager	2021-04-06 15:04:10 +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