Commit Graph

67 Commits

Author SHA1 Message Date
sebastien lussier
9fb42b5d8a Compare all set of UVs when trying to merge polygons in FMeshDescriptionOperations::GenerateUniqueUVsForStaticMesh
Swap vertices in material baking when mesh is mirrored
#rb none

#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 10285512 via CL 10285513 via CL 10285514
#ROBOMERGE-BOT: (v591-10236483)

[CL 10285554 by sebastien lussier in Main branch]
2019-11-18 09:08:13 -05:00
sebastien lussier
af0eb69a21 #jira UE-83144
Certain texture maps generated by merge actors would be red instead of greyscale

#rb rolando.caloca, uriel.doyon
#rnx

#ROBOMERGE-SOURCE: CL 10073049 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10073051 by sebastien lussier in Main branch]
2019-11-07 13:44:43 -05:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
jeremy moore
bb630dc0f6 Add support to material interface for querying RVT paramters
Stubbed out material instance implementation for now
Use the new interface in RVT parameter material expressions


#ROBOMERGE-SOURCE: CL 8556897 via CL 8562562
#ROBOMERGE-BOT: (v406-8472469)

[CL 8562734 by jeremy moore in Main branch]
2019-09-06 18:57:30 -04:00
sebastien lussier
f77413a77c Ensure the material proxy is always freed on the correct thread
#rb jeanfrancois.dube


#ROBOMERGE-SOURCE: CL 8362258 via CL 8364673 via CL 8368019
#ROBOMERGE-BOT: (v402-8361577)

[CL 8368177 by sebastien lussier in Main branch]
2019-08-28 20:49:07 -04:00
sebastien lussier
dd3e62a642 HLOD System - Rebuilding Medium HLODs sometimes results in bad textures
* Fixed stale materials in MaterialProxyPool
* Fixed memory leak
#jira UE-78913
[REVIEW] jeanfrancois.dube
[FYI] bryce.lumpkin


#ROBOMERGE-SOURCE: CL 8126046 via CL 8126053 via CL 8131826
#ROBOMERGE-BOT: (v401-8057353)

[CL 8156535 by sebastien lussier in Main branch]
2019-08-21 08:41:52 -04:00
sebastien lussier
01e45757e5 MaterialBaking: Remove cached materials instances from the material proxy pool when changes are made to one of it's parent material
[FYI] bryce.lumpkin


#ROBOMERGE-SOURCE: CL 7629383 via CL 7629384 via CL 7637104
#ROBOMERGE-BOT: (v372-7473910)

[CL 7637265 by sebastien lussier in Main branch]
2019-07-26 13:44:18 -04:00
sebastien lussier
0839438169 Improved the assignation of UV slots for custom interpolators.
- Now reusing unused slots instead of simply adding them after the last used slot.
- Added missing calls to GatherExpressionsForCustomInterpolators()

#rb chris.bunner, jurre.debaare


#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7321118 via CL 7321791
#ROBOMERGE-BOT: (v371-7306989)

[CL 7321793 by sebastien lussier in Main branch]
2019-07-16 09:48:17 -04:00
sebastien lussier
ab0f0c0bfd Backout CL 7226803 as some issues have been reported with Slate.
#rnx none
#rb marcus.wassmer


#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7228296 via CL 7231754
#ROBOMERGE-BOT: (v367-6836689)

[CL 7231779 by sebastien lussier in Main branch]
2019-07-08 14:42:08 -04:00
sebastien lussier
3ffe2a8e6b Improved the assignation of UV slots for custom interpolators.
- Now reusing unused slots instead of simply adding them after the last used slot.
- Also added missing calls to GatherExpressionsForCustomInterpolators()

#rb chris.bunner, jurre.debaare


#ROBOMERGE-OWNER: sebastien.lussier
#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 7226803 via CL 7227156
#ROBOMERGE-BOT: (v367-6836689)

[CL 7227160 by sebastien lussier in Main branch]
2019-07-08 09:42:23 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
kevin ortegren
454902f20b Now support static switches, quality switches and feature switches for the Shading Model from Material Expression. Done by collecting the shading models used during material translation.
#rb none
[FYI] chris.bunner
#rnx


#ROBOMERGE-SOURCE: CL 6894721 via CL 6903921
#ROBOMERGE-BOT: (v366-6836689)

[CL 6904070 by kevin ortegren in Main branch]
2019-06-08 23:02:14 -04:00
Lina Halper
b0bdc590d5 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none

[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
Jurre deBaare
5c9307a334 Thread/core change for material baking, to include hyperthreading
#rb none
#jira none

[CL 6782682 by Jurre deBaare in Dev-Anim branch]
2019-06-03 04:57:52 -04:00
kevin ortegren
15d2e7a1e8 Reworked the Pre-Skinned Local Bounds node. Now outputs Half Extents, Extents, Min or Max of the bounding box. Also added tootips to the pins. This was added to the 12 bytes of padding in the primitive uniform buffer, so no increase in size. This is compatible with previous usage of the node.
#rb none
[FYI] krzysztof.narkowicz

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6615540 via CL 6616138 via CL 6616149
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6739384 by kevin ortegren in Dev-Anim branch]
2019-05-31 16:44:22 -04:00
kevin ortegren
bc07d8bb3e Adding compiling of Shading Model material output property for all the material compilers. Missing this was causing some material baking to fail.
#rb none
#rnx


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6339782 via CL 6339886 via CL 6339898
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6340608 by kevin ortegren in Dev-Anim branch]
2019-05-07 09:03:20 -04:00
kevin ortegren
6c6cdd51d9 Adds support for multiple shading models per material. Each material now has a bit field of which shading models it is using. Shading models for a material are selected through a new Shading Model material expression, which can be connected to the new Shading Model material output pin. This is opt-in by selecting "From Material Expression" in the Shading Model drop down on the material. With no changes, everything should behave like before, and the old workflow is still there. Optimized shader code should be as performant as before if not using more than one shading model.
[FYI] Chris.Bunner, Krzysztof.Narkowicz, Marcus.Wassmer, Yuriy.Odonnell, Matt.Kuhlenschmidt
#rb Krzysztof.Narkowicz

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6308573 via CL 6309266 via CL 6315508
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6321982 by kevin ortegren in Dev-Anim branch]
2019-05-06 17:02:17 -04:00
jurre debaare
934dd67e8d HLOD Emissive bakes have pink artifacts or other objects emissive planar mapped
#fix Make sure we retain Magenta pixels for emissive baked textures, and not apply emissive scaling to them to make sure they are masked out correctly when merging the different textures into the atlas
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6104752 via CL 6104754 via CL 6105018 via CL 6105094
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6127459 by jurre debaare in Dev-Anim branch]
2019-04-26 22:18:45 -04:00
kevin ortegren
79c3024ad5 Adding new material expression: Pre-skinned local bounds. This provides the bounds of the base pose, prior to any transforms.
#rb krzysztof.narkowicz
[FYI] daniel.wright

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 5460678 via CL 5462281 via CL 5462342
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5477348 by kevin ortegren in Dev-Anim branch]
2019-03-20 13:31:24 -04:00
Cody Albert
f49998c248 Fixed MaterialProxySettings and MaterialOptions customizations to adjust metadata for their FIntPoint instances instead of all FIntPoint properties
#rb none
#rn FIntPoint properties will no longer occasionally be clamped to (1,11585) in the details panel

[CL 5402076 by Cody Albert in Dev-Editor branch]
2019-03-14 17:18:10 -04:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Lina Halper
f7baa58bc9 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#fyi: Laurent.Delayen, James.Hopkin
#rb: none

[CL 4923303 by Lina Halper in Dev-Anim branch]
2019-02-06 14:35:56 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00