5908 commits

Author	SHA1	Message	Date
iLLiCiTiT	de6daa65ca	cleanup	2020-10-01 19:52:37 +02:00
Milan Kolar	bc17713217	Merge branch 'hotfix/nks-publishing' into 2.x/develop	2020-10-01 19:45:48 +02:00
Milan Kolar	09ae318242	Merge branch 'hotfix/nks-publishing' into develop	2020-10-01 19:45:41 +02:00
iLLiCiTiT	fb6061e80b	changed logic of environment keys loading	2020-10-01 19:44:02 +02:00
iLLiCiTiT	d7492a13c4	added example of usage raw json for environments	2020-10-01 19:36:43 +02:00
iLLiCiTiT	87df2ea101	added validation for env group keys	2020-10-01 19:30:18 +02:00
Petr Kalis	2e9be73326	Removed unload + reload to keep changes to untouched shaders	2020-10-01 19:20:00 +02:00
iLLiCiTiT	484a35ae52	modified way how environments are loaded	2020-10-01 19:15:23 +02:00
iLLiCiTiT	03bbc6e839	raw json can return env value/keys	2020-10-01 19:01:16 +02:00
iLLiCiTiT	65d51d56a8	raw-json can store environments	2020-10-01 18:51:42 +02:00
iLLiCiTiT	2933eab903	dicitonaries can merge metadata keys	2020-10-01 18:51:20 +02:00
iLLiCiTiT	9de4efc7c3	prepared method for merging metadata under same key	2020-10-01 18:50:10 +02:00
Milan Kolar	9f539c007d	Merge pull request #560 from pypeclub/hotfix/anatomy_instance_data_time_enhancement ... Anatomy instance data collection is substantially faster for many instances	2020-10-01 18:44:28 +02:00
Jakub Jezek	20b74ec234	fix(nks): space in path crashing	2020-10-01 18:34:46 +02:00
Jakub Jezek	88bbe2d156	fix(ftrack): print not for p27	2020-10-01 18:34:32 +02:00
Milan Kolar	fd1e6dd3c3	Merge pull request #564 from pypeclub/bugfix/missing_port_variable ... set port variable to None so the variable exists	2020-10-01 18:22:26 +02:00
Milan Kolar	9bca995019	Merge pull request #541 from pypeclub/feature/base_of_module_manager ... Base of pype module manager	2020-10-01 18:21:30 +02:00
Milan Kolar	1edb2669ca	Merge branch 'hotfix/fix-maya-scene-types-preset' into 2.x/develop	2020-10-01 18:15:07 +02:00
Milan Kolar	14593b5cd9	Merge branch 'hotfix/fix-maya-scene-types-preset'	2020-10-01 18:15:01 +02:00
Milan Kolar	0e2a47d922	Merge branch 'hotfix/fix-maya-scene-types-preset' into develop	2020-10-01 18:15:00 +02:00
Milan Kolar	ac37a288bc	Merge branch 'hotfix/579-Publish_EDL' into 2.x/develop	2020-10-01 18:11:52 +02:00
Milan Kolar	9cd15b94fe	Merge branch 'hotfix/579-Publish_EDL'	2020-10-01 18:11:38 +02:00
Milan Kolar	d22a45ea8b	Merge branch 'hotfix/579-Publish_EDL' into develop	2020-10-01 18:11:38 +02:00
iLLiCiTiT	d33de68566	removed has_only_environ_children	2020-10-01 18:02:48 +02:00
Milan Kolar	b82052c569	Merge branch 'master' into 2.x/develop	2020-10-01 18:02:35 +02:00
Milan Kolar	1bd660fdea	Merge branch 'hotfix/extract_review_odd_resolution'	2020-10-01 18:02:30 +02:00
Milan Kolar	2270354ed0	Merge branch 'hotfix/extract_review_odd_resolution' into develop	2020-10-01 18:02:29 +02:00
iLLiCiTiT	e804c47214	converting functions for overrides use new implemented conversions	2020-10-01 18:02:05 +02:00
iLLiCiTiT	08554af5fd	bases use converting in and out data	2020-10-01 18:01:38 +02:00
iLLiCiTiT	116c9469c8	fix not implemented message	2020-10-01 18:01:04 +02:00
iLLiCiTiT	e6749a53f7	added 2 functions for converting gui data for storing and oposite	2020-10-01 18:00:11 +02:00
iLLiCiTiT	ec445fcc2d	added new M_ENVIRONMENT_KEY for storing environments	2020-10-01 17:59:32 +02:00
iLLiCiTiT	4903c09f40	variable POP_KEY renamed to M_POP_KEY	2020-10-01 17:59:20 +02:00
iLLiCiTiT	9afcdd3546	renamed variable OVERRIDEN_KEY to M_OVERRIDEN_KEY	2020-10-01 17:59:04 +02:00
iLLiCiTiT	8a8aa0422d	raise KeyError exception not just create	2020-10-01 17:57:51 +02:00
iLLiCiTiT	227755669f	METATADATA_KEY is object not type	2020-10-01 17:57:21 +02:00
iLLiCiTiT	5944a6719a	Merge branch 'develop' into feature/environments_in_settings	2020-10-01 17:53:24 +02:00
iLLiCiTiT	2c6797e63a	fixed typo	2020-10-01 17:11:06 +02:00
Jakub Jezek	4b754eed90	fix(global): removing reformating of odd resolution	2020-10-01 17:07:59 +02:00
Jakub Jezek	2a14a586c8	fix(standalone): fixing space in path for thumbnailer	2020-10-01 17:05:34 +02:00
Milan Kolar	17f22c12b8	Merge branch 'master' into 2.x/develop	2020-10-01 16:33:36 +02:00
Milan Kolar	25566cb9cb	Merge branch 'hotfix/harmony-clashing-namespace' into develop	2020-10-01 16:33:28 +02:00
Ondrej Samohel	3f628d1267	minor fixes	2020-10-01 16:19:37 +02:00
Petr Kalis	ea521f8e12	Merge branch '2.x/develop' into bugfix/237-Updating_a_look_where_the_shader_name_changed_leaves_the_geo_without_a_shader	2020-10-01 16:16:59 +02:00
iLLiCiTiT	226ddab164	preparation for storing to separated environments settings	2020-10-01 16:15:38 +02:00
iLLiCiTiT	15bb321b1f	system widget can store environment fields	2020-10-01 15:44:17 +02:00
iLLiCiTiT	70780cbc53	also make sure output width or height does not contain odd numbers	2020-10-01 15:19:41 +02:00
iLLiCiTiT	dbf0881415	first video filter will add padding to input if has width or height with odd numbers	2020-10-01 15:19:01 +02:00
Ondrej Samohel	11cf4056a7	replace files in current representation	2020-10-01 14:53:03 +02:00
Ondrej Samohel	face948e3f	Merge branch '2.x/develop' into feature/tiled-exr-to-scanline	2020-10-01 13:58:02 +02:00