11 Commits

Author	SHA1	Message	Date
jackalbe	a7a22bfcc0	Merge branch 'main' into sceneapi_script_autotest	2021-04-14 08:32:59 -05:00
alexpete	8469c9ca0a	Integrating github/staging through commit 5f214be	2021-04-13 17:18:57 -07:00
jackalbe	77d06ecef7	ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty ... * removed the script rule from the Editor, now will only be supported via a script or JSON manual edits * Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error * added a test to make sure Script Processor Rule operates with an empty filename Jira: https://jira.agscollab.com/browse/ATOM-14889 Tests: Launched the Editor to removed the script rule from the Editor	2021-04-12 12:30:30 -05:00
alexpete	c5b955d281	Integrating github/staging through commit b0dd7ed	2021-04-09 12:03:26 -07:00
alexpete	1044dc3da1	Integrating github/staging through commit ab87ed9	2021-04-09 11:27:37 -07:00
alexpete	c2cbd430fe	Integrating up through commit 90f050496	2021-04-07 14:03:29 -07:00
Brian Herrera	39f53338bf	Merge branch 'main' into LoadPipelineFromGitHub	2021-03-26 17:05:57 -07:00
alexpete	36c4e827bd	Integrating latest from github/staging ... Integrating up through commit 5e1bdae	2021-03-26 14:32:02 -07:00
Brian Herrera	e8bbb5a0d5	Set scripts to be executable ... This is required to build on linux/mac	2021-03-26 09:26:12 -07:00
alexpete	75dc720198	Integrating latest 47acbe8	2021-03-25 13:57:57 -07:00
alexpete	a10351f38d	Initial commit	2021-03-08 14:30:57 -08:00