2ae7a5ef9f
Added a unit test for the MaterialPropertyValue bug fix.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-17 12:04:46 -08:00
8b82452a1b
Updated ResolvePathReference to also early-return when the path is empty. @gadams3 said this would be helpful to him.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 17:30:33 -08:00
7d48e8209c
Updated a failing unit test.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 17:28:57 -08:00
cdb38251d8
Fixed an issue that prevented saving child materials with explicitly empty texture properties.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 17:19:44 -08:00
5cf65012b1
Updated RPI.Edit's AssetUtils to use the same TraceLevel enum as RPI.Reflect's AssetUtils. This is now used in GetImageAssetReference to remove a redundant error message since the error is also reported in MaterialSourceData and MaterialTypeSourceData.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 12:31:33 -08:00
284a44d74c
Updated AssetUtils::ResolvePathReference to avoid "The second join parameter is an absolute path" warnings from StringFunc::Path::Join.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 11:45:26 -08:00
ebc92c5b08
Restored a bit of error checking that appears to have been removed by mistake, in MaterialPropertyUtil ConvertToExportFormat(). This is important for the missing texture use cases, because this error checking is what will prevent the Material Editor from silently replacing a broken texture reference with no texture reference.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 10:52:03 -08:00
9f7815fa04
Fixed up a couple incorrectly or incompletely resolved merge conflicts.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 10:35:49 -08:00
db3d41ad9d
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-16 10:06:28 -08:00
c3dacb1e52
Unlocked a mutex after modifying the associated variable ( #5625 )
...
* Unlocked a mutex after modifying the variable the mutex was meant for.
This fixes an issue where mounting bundles in the Editor was causing the Editor to freeze up, because the following line, m_levelOpenEvent.Signal, resulted in another attempt to lock that same mutex.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Added a comment describing why the unlock is necessary.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-16 08:07:20 -08:00
5e04ddcc02
Merge pull request #5647 from aws-lumberyard-dev/cgalvan/UpdateSplashScreenName
...
Updated splash screen and about dialog with Stable 21.11 name
2021-11-16 09:34:22 -06:00
b20a9b5f39
Some modifications required for restricted platforms: ( #5624 )
...
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-16 08:27:32 -07:00
ce10906671
Updated splash screen and about dialog with Stable 21.11 name
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-16 08:08:53 -06:00
7da0913900
Fixed empty cluster UI appearing in joints component mode. ( #5547 )
...
Happens if 'limits' or 'breakable' settings are off on the joint when entering component mode.
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-16 10:57:32 +00:00
a5adf33427
Deactivate new Asset Picker View by default in the Editor ( #5614 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-16 10:47:02 +00:00
224e0bd20f
Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 00:02:20 -08:00
a789d7b762
Minor code cleanup.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 00:00:10 -08:00
2657620846
Minor code cleanup.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 23:56:10 -08:00
1b9526a1e2
Merge pull request #280 from aws-lumberyard-dev/Atom/santorac/MaterialEditorHandlesMissingTextures2
...
Changed the overall strategy for how to handle missing image references
2021-11-15 23:23:02 -08:00
aa85963a2b
Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 23:21:21 -08:00
7d849cc0d2
Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
...
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 16:51:22 -08:00
7031147e32
Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. ( #5623 )
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-15 17:01:47 -06:00
e1fb2ad368
Update resource mapping schema to make default account ID optional ( #5475 )
...
Signed-off-by: Stanko <stankoa@amazon.com >
2021-11-15 14:48:32 -08:00
8b7e538dd3
Cherry Pick: [LYN-7463] Fix insert streaming request failure ( #5604 ) ( #5622 )
...
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Re-enable disabled test which was failing for the same reason.
Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Instead of using a mutex, re-order the statements to remove the streamer request first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 0cea59d66980125227+amzn-mike@users.noreply.github.com >
2021-11-15 14:14:43 -08:00
82c83b2c5a
Merge pull request #5600 from aws-lumberyard-dev/carlito_fix_sc_rt_asset_load
...
Move SC runtime asset static initialization out of data loading threads
2021-11-15 12:19:22 -08:00
fc547d902c
Add message to indicate Json serialization of bitset is not supported ( #5590 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-15 14:09:43 -06:00
bc82afa87a
Merge pull request #5606 from aws-lumberyard-dev/Atom/guthadam/fixing_double_registration_of_hair_asset
...
Fixing double registration of hair asset
2021-11-15 13:27:31 -06:00
3d84876e87
Merge pull request #5615 from aws-lumberyard-dev/Atom/guthadam/material_editor_taking_focus_when_opening_new_document
...
Bug fix for material editor not taking focus when opening a new docum…
2021-11-15 13:26:57 -06:00
b3e2c3f075
SetComponentProperty is now supported by undo operation ( #5599 )
...
* Adding undo support to SetComponentProperty to make it function with prefab system
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Renaming a variable
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-11-15 11:01:42 -08:00
5c0fe6a54f
Fix for CSM shimmering ( #5607 )
...
* Fix for CSM shimmering
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
* removing debug code
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-11-15 10:16:25 -08:00
533b80095b
Fix for cascade shadow map clipping out too close to the camera ( #5509 )
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-11-15 10:16:06 -08:00
c44d03a40d
Asset bundler test fixes ( #5548 )
...
* Cleaning up errors with default assets, used in bundled release builds
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated simple asset references to be to the product, not source assets
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Fixed test_WindowsAndMac_FilesMarkedSkip_FilesAreSkipped to pass again.
Updated the test to verify the assets are actually skipped and not just missing, by having it first run without the skip command and verify they are in the first run. Also updated logging to print out sorted lists, to make it easier to debug failures on Jenkins in the future.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Removed a test marked skip for legacy levels that featured a lot of assets that are no longer valid.
I don't think we need this specific test anymore in the future because prefabs replace the level system, and prefabs should have their own tests for product dependencies.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated project path to use absolute path (#5459 )
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Updated project path to work with latest project path changes
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Changed to workspace.paths.project() for getting full path to projects
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
Co-authored-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 09:10:04 -08:00
d9746647e1
Bug fix for material editor not taking focus when opening a new document from the main editor or outside of the material editor
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-15 10:54:34 -06:00
f2068397fa
CameraRigComponent - Disable Component Checkbox when the two others are toggled ( #5546 )
...
* Disable component checkbox when the other two components are already ignored.
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Fixed EditContext Indents
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Fixed Header file
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* Fixed Spaces
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
* fixed new line
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-15 10:51:16 +00:00
1925d08f41
Fixing double registration of hair asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-13 13:52:56 -06:00
76b7e73f6f
Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting ( #5593 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 16:23:04 -08:00
d0cf18e778
remove test code artifact
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-11-12 14:56:27 -08:00
c140b882d2
Fix mis-spelled comment
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-11-12 14:19:22 -08:00
5ec5824849
Hide the "up one level" button temporarily. ( #5595 )
...
Signed-off-by: Danilo Aimini <daimini@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-12 14:16:44 -08:00
9898b6ee45
Move SC runtime asset static initialization out of data loading threads
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-11-12 13:47:30 -08:00
4d3c977d58
Merge pull request #5585 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_relative_paths_to_stab
...
Cherry pick material editor saves relative paths to external references and test support to stabilization
2021-11-12 14:54:36 -06:00
b0dfe26232
The Build Time Stamp of ShaderAsset And ( #5373 )
...
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()
GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.
* Updated DiffuseGlobalIllumination precompiled shaders
Co-authored-by: dmcdiar <dmcdiar@amazon.com >
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-12 13:51:07 -06:00
520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
...
Removing references and builders for legacy MTL assets
2021-11-12 13:47:50 -06:00
cb1a45f9ec
Merge pull request #5578 from aws-lumberyard-dev/LYN-7816_FixNoParamRPCCompilation
...
RPCs Without Parameters Compile
2021-11-12 11:37:04 -08:00
c0df1846f4
Create desktop shortcut functionality ( #5536 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 11:03:43 -08:00
282c93c20c
Removed source art files for default textures.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-12 10:33:47 -08:00
013b0c97e0
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-12 10:28:53 -08:00
b44ce82435
Private dependencies are not propagated to other targets in generated install layout ( #5581 )
...
* transfering private dependencies as runtime dependencies for the generated targets in the install layout
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Update cmake/Platform/Common/Install_common.cmake
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Update cmake/Platform/Common/Install_common.cmake
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-11-12 08:40:56 -08:00
bceadf7597
Fixes for CMake 3.22rc ( #5314 ) ( #5580 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-12 08:40:10 -08:00
198f225bbe
Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 21:48:47 -06:00
santorac
AMZN-stankowi
Chris Galvan
bosnichd
amzn-sean
AMZN-Igarri
allisaurus
amzn-mike
carlitosan
amzn-sj
Guthrie Adams
Mikhail Naumov
mrieggeramzn
Guthrie Adams
AMZN-nggieber
Danilo Aimini
galibzon
kberg-amzn
Alex Peterson
Esteban Papp