Commit Graph

7670 Commits

Author SHA1 Message Date
Olex Lozitskiy 34c0fb86ac [SIG-Network] development branch build fix for test code
Updated test code to the latest network code.
2021-10-05 10:18:31 -04:00
AMZN-Olex c2a84de38c Updated mock-like interfaces for benchmarks
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-05 08:53:50 -04:00
AMZN-Olex 5cf6236bd9 Fixing development build break
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-05 08:46:48 -04:00
Olex Lozitskiy 52d3e4c601 [SIG-Network] Google benchmarks for network hierarchy components.
First google benchmarks for hierarchy components.
2021-10-05 08:23:14 -04:00
hultonha ca26599f93 Remove legacy sandbox picking - no longer used (#4472)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-05 09:58:43 +01:00
AMZN-Olex 31b2fe427b Added a helpful comment on hierarchy benchmark
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-04 21:10:39 -04:00
Dennis Brakhane 7f75dc6dee Fix "index out of range" error in AssetProcessor (#4324)
* Fix "index out of range" error

When the parent is the tree root element, beginInsertRows must be
called with an invalid (but legal) index. A QModelIndex with a row
index of zero when the parent has no children is an illegal index
and will result in "undefined behavior", like the "index out of
range" one.

Therefore, if our parent is the tree root element, we use QModelIndex()
instead.

Fixes #2343

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>

* Use QModelIndex() instead of createIndex(-1, -1)

Both do the same, but the former is Qt best practise.

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>

* add some sanity checks in debug mode

Using illegal ModelIndices can result in hard to debug problems later
on, so add a few checks to help spotting them sooner.

Signed-off-by: Dennis Brakhane <brakhane@gmail.com>
2021-10-04 17:41:35 -07:00
puvvadar 258fa765b5 Merge pull request #4431 from aws-lumberyard-dev/mp_handshake_conndata
Move handshake check to connection data
2021-10-04 17:10:17 -07:00
Stephen Tramer 678c9a9fe9 Merge pull request #4449 from FiniteStateGit/issue-913
AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
2021-10-04 15:46:54 -07:00
puvvadar 91aafdcdde Fix bad include in NetworkTransformTests
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-10-04 15:17:01 -07:00
puvvadar 55a10278c2 Merge branch 'development' of https://github.com/o3de/o3de into mp_handshake_conndata 2021-10-04 15:12:53 -07:00
Luis Sempé 11d047136e Merge pull request #4428 from aws-lumberyard-dev/scripting/xfail_test
Marked test_VariableManager_UnpinVariableType_Works as xfail, the tes…
2021-10-04 14:53:42 -07:00
Scott Romero 1e4faca332 [development] Revived the statistical profiler (#4378)
- Removed unused RunningStatisticsManager.cpp
 - Updated stats profiler proxy to use budgets
 - Fixed and re-enabled stats profiler tests
 - Enabled StatisticalProfilerProxySystemComponent in runtime

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-10-04 14:49:16 -07:00
lumberyard-employee-dm 0a8170f52a Added IsDirectory function to SystemFile (#4454)
* Added IsDirectory function to SystemFile

This takes the implementation in LocalFileIO and uses it for SystemFile
and then just has LocalFileIO call the SystemFile implementation

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed logic to detect the WinApi FILE_ATTRIBUTE_DIRECTORY attribute

Updated the FileIO.cpp test to use AZ::IO::Path and removed direct uses
of AZStd::string

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding googletest printers for string and Path classes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the SystemFile_WinAPI functions to use AZStd::to_wstring

This makes the the SystemFile function convert from UTF-8 to UTF-16

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-04 16:36:54 -05:00
Ken Pruiksma 7052ccfa52 Terrain detail and macro texture support (#4403)
* Terrain feature processor improvements regarding material, mesh, and lod
- Now using a material with pbr lighting for terrain. Removed some of the old shader code that wasn't needed anymore
- Move heightmap image declaration to the material so it's not needed in the object SRG anymore
- Added prototype code (commented out) for smoothing the terrain with a b-spline weighting function
- Mesh data is all made with a proper mesh asset now.
- Added basic LOD support (no continuous LOD yet, but it does pop between lod levels)
- Moved RenderCommon to be accessible publicly. It contains stencil refs that should be public.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding more material options to terrain shader

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing terrain's per object srg because of changes in the default per object srg.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added more features to the terrain material. Shader & Material reloads are now handled.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added stub for terrain render max area setting in the renderer component. Added detail texture tiling setable from the material

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Missing change to material type from last commit

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding macro material in material type and support detail roughness.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing merge issues in terrain material type

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Adding more features to the terrain material
- Macro color and normals
- Detail layer fade out
- Reoriented detail normals

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Remove line that unintentionally was added back during a rebase & merge.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing previously deleted unused static that came back after a merge. Fixed an issue with macro normals in the terrain shader.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-10-04 16:35:22 -05:00
Yaakuro 093f321b68 Fix issue that gives wrong results for running debugger (#4434)
* Fix issue that gives wrong results for running debugger

Signed-off-by: Yaakuro <y1@codeposer.net>

* Remove redundant part.

Signed-off-by: Yaakuro <y1@codeposer.net>
2021-10-04 16:34:55 -05:00
puvvadar 170a32d667 Merge latest to mp_handshake_conndata
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-10-04 13:58:09 -07:00
kberg-amzn 5acb360fbb Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup
Migration fixup
2021-10-04 13:50:28 -07:00
Qing Tao 9823d5cdf2 LYN-6793 [iOS] [asset_profile] Assets fail to process for iOS due to timeouts (#4456)
Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-04 13:30:45 -07:00
Alex Peterson 555e95679d Open CMake GUI from Project Manager (#4360)
This provides a fast way for engineers who want to configure -> generate -> open project in IDE -> build & run to do so without waiting for a potentially lengthy Project Manager build.

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-04 13:20:42 -07:00
lumberyard-employee-dm c9608846a1 Updated the AssetProcessorManagerTest LockFileTest to check the Source… (#4459)
* Updated the AsetProcessorManagerTest LockFileTest to check the SourceFileNotificationMessage

If the SourceFileNotificationMessage indicates that the source file was
removed, it triggers the callback to spin off a thread to remove the
product file.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed SourceFileNotificationMessage cast to use azrtti_cast

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-04 15:17:41 -05:00
chcurran a52faa7340 Fixed qthread error coming from file i/o thread
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-10-04 13:03:55 -07:00
Guthrie Adams 09c6101b8b Merge pull request #4416 from aws-lumberyard-dev/Atom/mriegger/stopdecalflickering
Adding some code to cache the material in the editor component to avo…
2021-10-04 14:53:49 -05:00
Steve Pham 6dcdb5787a Fix release build errors on Linux/Mac (#4474)
* - Fix unused release warnings
- Fixed compile errors from missing includes
- Commented out missing AZ_ATOM_PROFILE_FUNCTION macro

Signed-off-by: Steve Pham <spham@amazon.com>

* Deleted AZ_ATOM_PROFILE_FUNCTION

Signed-off-by: Steve Pham <spham@amazon.com>

* Adding more unused errors from windows release build, and updates based on PR suggestions

Signed-off-by: Steve Pham <spham@amazon.com>
2021-10-04 11:57:39 -07:00
lumberyard-employee-dm 6c3ac70531 Added the "external_subdirectories" array object to the Project Templates (#4460)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-04 13:09:21 -05:00
bosnichd 29b5f4c9e5 Added Floor, Ceil, and Round functions to AZ::Vector2/3/4 (#4470)
https://github.com/o3de/o3de/issues/4216
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-10-04 11:29:59 -06:00
kberg-amzn 9f209dceea Fix casing issue with client hierarchy tests
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-04 09:43:43 -07:00
kberg-amzn 66ab15a4b6 Removing old EntityReplicationManager.h that got re-added, this has been moved to public includes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-04 09:39:35 -07:00
Adi Bar-Lev 9786d63596 Hair - Hair Gem introduction to O3DE from Atom/barlev/AtomTressFX_DevRebase (#4439)
* Hair
- First introduction of Hair gem to Atom and O3DE
- The hair technology is based off TressFX 4.1
- These are some of the areas we enhanced the original TressFX implementation:
   - Lighting model was replaced and we now use a modified Marschner model
   - Blending is done directly with the back buffer removing the silhouette of the original implementation
   - Hair depth / thickness is now calculated to remove incorrect back lighting (TT lobe in the Marschner model)
   - Thickness corrected to handle hair gaps hence introducing better light passage for the TT
   - The hair is fully integrated into the Atom pipeline and structure design
   - Usage of single shared buffer for the computer buffers reduces barriers sync overhead

Remarks:
- Collisions via SDF compute are to be introduced soon
- Improved shortcut rendering method ala Eidos Montreal to be introduced soon

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - code clean pass

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - EMFX Actor visibility implementation

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - COnnecting hair passes to Atom's MainPipeline.pass

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - adding dedicated thumbnail pipeline that does not include the hair gem

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - changed Atom shader files to allow hooking the hair to the lighting data structures

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixed a few headers to have the latest O3DE license + verification fixes

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - enabling editor component only when tool pipline is built + default texture add

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixing Linux and Android compilation builds

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - another files change to make Linux compile

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - more Linux and Android build fixes

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair

- Adding usage of fallback white texture
- Removing invalid null assignments into vectors
- Removing redundant mutex preventing deletion on some platforms

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair

- Shame: removed forgoten #pragma optimize
- Adding header complained by Android

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - removing the Hair Gem connection in the active project.

- This submission removes the connection to the active project hence allowing to run without the Gem.  Enable the passes in MainPipeline.pass and declare them again when you want to use the Gem.

Remark: the gem file PassTemplates.azasset was renamed and will be connected via code in the future to avoid the need to declare in the global pass template.
Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - registrating gem pass templates through the gem templates file (#198)

* Hair - registrating gem pass templates through the gem templates file

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - adding handler disconnect for the pass template registration.

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - PPLLIndexCounter buffer going data driven via the pass declarations (#202)

* Hair - PPLLIndexCounter buffer going data driven via the pass declaration
- Moving PPLLIndexCounter from code allocation and attachment to be data driven
- Fixed RPI typo bug that can prevent using buffers like that

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixing UI Editor (LYShine) crash (#209)

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair - resolved the multi pipeline mismatches and crashes + cleaned initialization & leftovers (#222)

* [Hair] - multiple render pipelines handling

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - Shut down order is handle to allow hair feature processor be deregistered only after the bootstrap component has disabled it

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - minor cleanups

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - followups from review nits

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - code fixes based on the CR remarks for the Hair merge to Dev (#248)

* Hair
- First introduction of Hair gem to Atom and O3DE
- The hair technology is based off TressFX 4.1
- These are some of the areas we enhanced the original TressFX implementation:
   - Lighting model was replaced and we now use a modified Marschner model
   - Blending is done directly with the back buffer removing the silhouette of the original implementation
   - Hair depth / thickness is now calculated to remove incorrect back lighting (TT lobe in the Marschner model)
   - Thickness corrected to handle hair gaps hence introducing better light passage for the TT
   - The hair is fully integrated into the Atom pipeline and structure design
   - Usage of single shared buffer for the computer buffers reduces barriers sync overhead

Remarks:
- Collisions via SDF compute are to be introduced soon
- Improved shortcut rendering method ala Eidos Montreal to be introduced soon

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - code clean pass

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - EMFX Actor visibility implementation

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - COnnecting hair passes to Atom's MainPipeline.pass

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - adding dedicated thumbnail pipeline that does not include the hair gem

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - changed Atom shader files to allow hooking the hair to the lighting data structures

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixed a few headers to have the latest O3DE license + verification fixes

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - enabling editor component only when tool pipline is built + default texture add

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixing Linux and Android compilation builds

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - another files change to make Linux compile

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - more Linux and Android build fixes

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair

- Adding usage of fallback white texture
- Removing invalid null assignments into vectors
- Removing redundant mutex preventing deletion on some platforms

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair

- Shame: removed forgoten #pragma optimize
- Adding header complained by Android

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - removing the Hair Gem connection in the active project.

- This submission removes the connection to the active project hence allowing to run without the Gem.  Enable the passes in MainPipeline.pass and declare them again when you want to use the Gem.

Remark: the gem file PassTemplates.azasset was renamed and will be connected via code in the future to avoid the need to declare in the global pass template.
Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - registrating gem pass templates through the gem templates file (#198)

* Hair - registrating gem pass templates through the gem templates file

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - adding handler disconnect for the pass template registration.

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - PPLLIndexCounter buffer going data driven via the pass declarations (#202)

* Hair - PPLLIndexCounter buffer going data driven via the pass declaration
- Moving PPLLIndexCounter from code allocation and attachment to be data driven
- Fixed RPI typo bug that can prevent using buffers like that

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixing UI Editor (LYShine) crash (#209)

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair - resolved the multi pipeline mismatches and crashes + cleaned initialization & leftovers (#222)

* [Hair] - multiple render pipelines handling

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - Shut down order is handle to allow hair feature processor be deregistered only after the bootstrap component has disabled it

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - minor cleanups

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* [Hair] - followups from review nits

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - last fixes based on CR remarks

Signed-off-by: Adi-Amazon <barlev@amazon.com>

* Hair - fixing AR

Signed-off-by: Adi-Amazon <barlev@amazon.com>
2021-10-04 10:46:31 -04:00
AMZN-Olex 3321f9e5ea First google benchmarks for hierarchy logic.
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-04 09:00:20 -04:00
amzn-sean 4d49a604af Moving run Physx Benchmarks behind a cmake flag (#4411)
The benchmark code is still built, as it is part of the PhysX.Tests project.
Currently jenkins has a 1500sec(25min) timeout, the benchmarks can sometimes take over 1500sec and cause a build failure for timeout.
Jenkins currently doesn't upload the results of the benchmarks, so this is ok.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-10-04 12:34:51 +01:00
moraaar 1c305c6402 Fixed physx asset when exported as convex or primitives. (#4414)
* Fixed physx asset when exported as convex or primitives. Before it was limited to 1 material for the entire object, now it correctly uses multiple materials by looking at the first material per node.

Signed-off-by: moraaar <moraaar@amazon.com>
2021-10-04 12:05:33 +01:00
jonawals d03273089e Merge pull request #4433 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
Change editor viewport mode tracker id from viewport to entity context.
2021-10-04 12:02:06 +01:00
John d5dcd3c74a Add explanatory comment to broadcast fixture.
Signed-off-by: John <jonawals@amazon.com>
2021-10-04 09:53:36 +01:00
hultonha f0c66cfa6f Remove references to legacy visibility system (#4441)
* remove look at interpolation position

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove visibility switch

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove references to object cache

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add some more asserts to catch code that should never run

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing [[maybe_unused]]

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert clang-format change

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-04 09:42:16 +01:00
John 8c55107e07 ViewportEditorModeInfo to ViewportEditorModeTrackerInfo.
Signed-off-by: John <jonawals@amazon.com>
2021-10-04 09:36:12 +01:00
Gene Walters 73891c71b7 Fix EditorServer connection by ensuring that SendReadyForEntityUpdates is only called after a handshake is finished and the editor has accepted the editorserver's connection. Also allow engine-centric projects to use editor-server by passing in the project-path when launching the editor-server. Also allow devs to set sv_defaultPlayerSpawnAsset from inside the editor and it'll be used by the editor-server
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-03 22:49:13 -07:00
Olex Lozitskiy 7dc5c8be61 NetworkTransformComponent replicates local transform for child entities
+ NetworkTransformComponent replicates world transform for parent entities
+ NetworkTransformComponent replicates local transform for child entities
+ Server-side and client-side unittests
2021-10-02 09:50:10 -04:00
Guthrie Adams aca5961eb7 Merge pull request #4376 from aws-lumberyard-dev/Atom/guthadam/material_editor_replace_modified_color_with_indicator
Replace modified property name highlighting with indicator icon in material editor and component inspectors
2021-10-01 18:42:01 -05:00
FiniteStateGit 49cfc67f61 AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
Signed-off-by: FiniteStateGit <31811688+FiniteStateGit@users.noreply.github.com>
2021-10-01 16:13:59 -07:00
Mike Cronin 1245c2361d Updated documentation_url field. This doc is being moved per: https://github.com/o3de/o3de.org/pull/993
Signed-off-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com>
2021-10-01 16:06:11 -07:00
kberg-amzn 98e5a18e49 Fixes for API changes from most recent integrate
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-01 16:06:11 -07:00
Qing Tao 5f8e60f4bb ATOM-16558 Buffer memory leak (#4444)
Fixed the memory leaking with ID3D12CommandAllocator in DX12 AsyncUploadQueue. Add reset for the ID3D12CommandAllocator when the commandlist was executed.
Fixed another small memory leak in NativeWindow.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-01 15:55:37 -07:00
mrieggeramzn ba23583d5f Adding gadams feedback
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-01 15:54:49 -07:00
kberg-amzn bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-01 15:04:50 -07:00
AMZN-Olex 65b82b41d6 Added unittest for an activation test
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-01 17:56:32 -04:00
Guthrie Adams 050de68f7d Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
2021-10-01 16:39:57 -05:00
Guthrie Adams 323026fbd5 Merge pull request #4361 from aws-lumberyard-dev/Atom/guthadam/material_editor_add_toggle_alternate_skybox_to_toolbar3
Material Editor: Added alternate skybox toggle to the toolbar
2021-10-01 16:17:11 -05:00
Esteban Papp f3e6adce7f LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changing trace back to expand to nothing for release

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixing some more unused variable cases

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* renaming file in ScriptCanvas that causes a msbuild warning

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-01 13:52:52 -07:00
mrieggeramzn 76de21940d Fixup merge
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-10-01 13:29:52 -07:00