c7284a781e
Merge pull request #6365 from aws-lumberyard-dev/Atom/guthadam/materialcomponent/workaround_for_lost_image_overrides_with_prefabs
...
Temporary fix for material component losing image overrides with prefabs
2022-01-04 11:28:39 -06:00
d7dc257927
Add MainPipeline to pass hierarchy for when HDR color grading component requests for the lut generation's image attachment. ( #6436 )
...
Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com >
2021-12-16 12:07:37 -08:00
fc3c5fbd09
[Mac] Fix build error in ( #6410 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-12-16 09:43:00 -08:00
94ddafc7a2
Atom/qingtao/image builder fixes ( #6432 )
...
* LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359 )
Fixed a editor hanging issue when preview texture with astc format (starts multiple job threads inside a job thread)
Fixed an issue of changing texture setting didn't trigger image re-process.
Fixed an issue with image asset which has texture setting may have dependency with wrong preset
Added a EIF_HDR for source image in hdr format.
Fixed astc compression issue which may wrongly compress image to HDR astc format
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
(cherry picked from commit d9f0a3012d#6412 )
Fixed a regression issue with image builder which it can choose proper preset for images with alpha content.
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
(cherry picked from commit b640f6d691
2021-12-16 09:19:44 -08:00
fb36145e2e
Rte fixes for stability ( #6434 )
...
* Fixed SRG updated related crash
Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com >
* Fixed SRG compile issue with metal which leads to multiple gpu crashes inlucde ImGuiPass render crash (#6315 )
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
Co-authored-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
2021-12-15 18:35:17 -08:00
a60fba5bec
Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector
...
Signed-off-by: rgba16f 82187279+rgba16f@users.noreply.github.com
2021-12-14 14:15:36 -06:00
197e7b95e1
Fix for change with axis gizmo labels not appearing ( #6256 ) ( #6387 )
...
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-14 09:24:10 +00:00
a2bb968371
Merge pull request #6345 from aws-lumberyard-dev/sc-editor-onto-rte-part4-6322
...
Sc editor onto rte part4 6322
2021-12-13 13:15:59 -08:00
2d13b648da
Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector
...
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-12-13 13:16:02 -06:00
0a1dc3c4bd
Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:54 -08:00
837e532ad7
fail safe for EditorScriptCanvasComponents saved before AZ::IO::Path got json support
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:52 -08:00
a5b30ffc5a
fix interpreted statics
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:50 -08:00
9830925309
small fixes for SC play in editor and warnings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:49 -08:00
0963bc0cc5
removed commented out include
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:47 -08:00
dc538d94e5
update error window message and add AP launch request
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:45 -08:00
cbc70b4b88
Add dialog window for messaging when SC assets fail to save
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:43 -08:00
aeabf21bba
clean up debug output settings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:41 -08:00
0f07de7454
fix verbose setting
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:39 -08:00
ac6c90cd2c
pre-PR cleanup
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:37 -08:00
169416c2f9
remove testing code
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:35 -08:00
d284d908b9
Make version explorer wait on AP for dependent assets
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:33 -08:00
d8e5315199
Use weak reference for undo state, as it is an entirely internal class
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:31 -08:00
b9bbe233be
Restore undo/redo
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:29 -08:00
3e728d1183
fixed another string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:27 -08:00
b10c679c33
fixed string_view printf error caught by linux compiler
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:25 -08:00
4f00718a38
fix linux build error, change translation system errors to warnings
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:23 -08:00
07bf8fc755
fix linux build error
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:21 -08:00
0cc4c06213
remove uneeded files/comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:19 -08:00
d31c6a2774
remove uneeded files/comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:28:17 -08:00
b0ef83e194
Delete $tmp29198_Test_LY_79396.scriptcanvas
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-13 10:27:50 -08:00
3bca63bb71
Temporary fix for material component losing image overrides with prefabs
...
The bug reported that overridden texture properties would be lost whenever an entity was created, destroyed, or a prefab was created. Initially, it seemed like there was a problem with the custom JSON serializer for material properties. Debugging proved this to be incorrect because all of the data was converted to JSON values in the serializer on multiple passes. At some point during prefab patching, the data for the asset properties is lost while other values like colors and floats serialize correctly. Converting the asset data values into asset IDs resolves the immediate problem for the material component but the underlying issue is still under investigation by the prefab team. This change is being posted for review in case the underlying issue cannot be resolved in time for the next release.
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
Fixing unittests and moving texture conversion into material component controller
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-13 11:35:05 -06:00
40e1116e26
Use LegacySystemInterfaceCreated to initialize physics material library. ( #6168 ) ( #6347 )
...
* Use LegacySystemInterfaceCreated to initialize physics material library. OnCatalogLoaded was used before but it's not called when running the editor without assets processed yet.
Signed-off-by: moraaar <moraaar@amazon.com >
Co-authored-by: moraaar <moraaar@amazon.com >
2021-12-13 12:10:36 +00:00
87023cae47
finish last of pre-PR clean up, including saving over previsouly opened tabs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:46 -08:00
6421463df2
clean up WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:46 -08:00
2c107c364f
fix mismatched file name on modification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:45 -08:00
d8add36212
restore file save
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:45 -08:00
499cdaae5e
version upgrader in a presumed working story
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:44 -08:00
55fa33cff4
Clean up modifier asset handling. Fix file handling string error.
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:44 -08:00
c4ea3075cc
fixed unit tests bugs, removed commented out code, removed loading spam
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:43 -08:00
8357fa34e9
fixed unit testing code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:42 -08:00
27cc659ab9
Editor Script Component simplified and working
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:42 -08:00
66e744785f
EditorCOmponent build pipeline WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:41 -08:00
23267fd862
SC Editor serialization update in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:41 -08:00
5db535d1dd
Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux
2021-12-10 11:56:40 -08:00
d9f849b03e
File state change include external delete detection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:40 -08:00
ca5424dd7b
Fixed asset completer model for source handle picker.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-10 11:56:39 -08:00
b44541c440
Merge pull request #281 from aws-lumberyard-dev/cgalvan/SCSourceFilePicker
...
Added property handler for SourceHandle type
2021-12-10 11:56:38 -08:00
805bd8ef56
fix graph tab selection:
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-12-10 11:56:37 -08:00
31304ee9b1
Fixed issue when clearing out source handle property.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-10 11:56:37 -08:00
c36d827fc5
Updated Script Canvas component to use source handle property.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-10 11:56:36 -08:00
Chris Galvan
hershey5045
amzn-sj
Qing Tao
moudgils
rgba16f
Tom Hulton-Harrop
carlitosan
Guthrie Adams
lumberyard-employee-dm