Commit Graph

68 Commits

Author SHA1 Message Date
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -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
Chris Gagnon
d7d4ee7b38 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
#rb none
#fyi Max.Chen, Tim.Gautier

[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -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
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Richard TalbotWatkin
1ca56fc5b2 MeshDescription now uses triangles as its primary face representation. They can and should be used in preference to polygons when a mesh is known to be entirely triangulated, as they are quicker, and can be used in exactly the same way.
Creating a triangle will also create a 'shadow' polygon for backward compatibility, although this is omitted when serializing.
As with polygons, any missing edges are created when creating a new triangle, and operations such as adjacency are available to triangles, just as for polygons.
The native serialization format for MeshDescription is now based around triangles.
Polygons of arbitrary number of edges may still be represented, and when created, will automatically generate the appropriate number of triangles.  Polygons of more than three sides automatically generate 'internal edges', which are owned by the polygon, and which will be regenerated if the polygon is retriangulated. Internal edges are otherwise not distinct from other edges, and can be used to determine connected triangles or vertices.
Direct access to public members of mesh element classes (FMeshVertex, etc) is now deprecated. In particular, vertex instances and edges now hold a list of connected triangles, and the ConnectedPolygons member is deprecated and will be removed (as this data can be derived from the ConnectedTriangles list).
Improved the MeshDescription API, providing more operations, and allowing arrays with different allocators to be provided as results containers.
Fixed several MeshEditing operations.
Added MeshDescription unit tests.
#rb none

[CL 7099758 by Richard TalbotWatkin in Dev-Editor branch]
2019-06-20 08:20:20 -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
Chris Gagnon
3f047f360b Fixed crash when generating an incorrect node type connected to "GetPropery" of material options.
#jira UE-75801
#rb Frank.Fella
#codereview Jurre.Debaare

[CL 6865274 by Chris Gagnon in Dev-Editor branch]
2019-06-06 14:57:06 -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
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -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
Matt Kuhlenschmidt
fddbe0a896 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -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
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -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