Commit Graph

142 Commits

Author SHA1 Message Date
Guillaume Abadie
8e7826556f Implements DD{X,Y}(UVs) inputs on the TextureSample material node.
#code_review: Martin.Mittring

[CL 2617143 by Guillaume Abadie in Main branch]
2015-07-10 15:55:51 -04:00
Steve Robb
7661666dcb Error when a module is both a dependency and dynamically loaded.
Fixes for lots of existing modules by removing all dynamically loaded duplicates (this is probably not the correct solution, but is the safest).

#codereview robert.manuszewski

[CL 2610845 by Steve Robb in Main branch]
2015-07-06 05:46:20 -04:00
Chris Wood
514c1e6f9c Fix non-unity build error in MaterialEditorDetailCustomization.cpp
[CL 2608973 by Chris Wood in Main branch]
2015-07-02 09:20:08 -04:00
Daniel Wright
c6917f34da Scalar parameter SliderMin/Max affects DefaultValue editing as well as MI parameter editing
[CL 2608422 by Daniel Wright in Main branch]
2015-07-01 18:00:42 -04:00
Simon Tovey
1ae9eb4c48 UE-11390 - Parameters not appearing in Material instances
This is now "fixed". This was only ever a problem for parameters that fed into a function input's Preview pin.
They will never have an impact on the final material's color and so are useless. But as it's such a minor edge case, it's not worth the effort of the real solution which would be to disallow connecting parameters to the preview in in the first place. Or something along those lines.

[CL 2608348 by Simon Tovey in Main branch]
2015-07-01 17:35:04 -04:00
Daniel Wright
02f75355ad Removed ensure if expression is not found in MI editor, was spamming before, effectively causing a crash
[CL 2608082 by Daniel Wright in Main branch]
2015-07-01 15:52:17 -04:00
Matt Kuhlenschmidt
e5c04df58a Fix crash copy and pasting material function call nodes while live preview is disabled. We now properly update the node from the material function resource
https://jira.ol.epicgames.net/browse/UE-17746

[CL 2607678 by Matt Kuhlenschmidt in Main branch]
2015-07-01 12:55:20 -04:00
Simon Tovey
d76ace05e2 UE-17106 - Change the dynamic parameter default value back to 1.
Added DefaultValue property to DynamicParameter material node. This defaults to 1 for new materials but 0 for existing ones to maintain current behavior.
This default is used for all vertex factories other than those for particles. In particle vertex factories, the dynamic parameter is used, as before. Sometimes coming from vertex data, others coming from a default vertex buffer filled with 1.0.

Also, defaulted the DynamicParameter on the cascade side to 1.0 to improve workflow that side too.

#codereview Olaf.Piesche

[CL 2605332 by Simon Tovey in Main branch]
2015-06-30 05:54:23 -04:00
Daniel Wright
65435c5d3c Scalar material parameters can specify the slider min and max for the material instance editor
[CL 2601295 by Daniel Wright in Main branch]
2015-06-25 17:01:23 -04:00
Matt Kuhlenschmidt
97b4a85d1e Fix variable shadowing issues
[CL 2597194 by Matt Kuhlenschmidt in Main branch]
2015-06-23 11:31:37 -04:00
Matt Kuhlenschmidt
a8e464afda Fix mac compile errors
[CL 2596133 by Matt Kuhlenschmidt in Main branch]
2015-06-22 17:02:00 -04:00
Matt Kuhlenschmidt
b191daa248 Undo/Redo for switching material domains now properly updates the views in the material editor
[CL 2596064 by Matt Kuhlenschmidt in Main branch]
2015-06-22 16:10:43 -04:00
Matt Kuhlenschmidt
9f83927366 Added a UI material domain for all Slate and UMG materials
- Automatically upgraded all materials

When using the UI material domain the material editor and material instance editor is streamlined and only displays parts of the UI that are relevant:
- Changes to a preview material rendered with the UI shader
- Removes non-UI specific settings
- Renames some output pins and hides irrelevant ones
- Shows stats for UI shader

[CL 2596027 by Matt Kuhlenschmidt in Main branch]
2015-06-22 15:55:50 -04:00
Matt Kuhlenschmidt
6cda1e8193 Added error message if a material expression parameter name is too long.
Added the ability to display an error popup on the node if text verification fails.  The code existed for this but was non-functional

[CL 2583007 by Matt Kuhlenschmidt in Main branch]
2015-06-10 13:53:25 -04:00
Adric Worley
71e364d8cc Fixing missing loctext undef
[CL 2580184 by Adric Worley in Main branch]
2015-06-08 13:50:52 -04:00
Adric Worley
81410eb8b8 Material Editor promotion tests warn instead of fail if no settings are defined.
The tests fail instead of warn if settings are defined but assets cannot be loaded.
Clarified test failure logging.

[CL 2575785 by Adric Worley in Main branch]
2015-06-03 12:59:54 -04:00
Adric Worley
d8f31f2c67 Fix Material Promotion test never finishing if settings are blank (UEAUTO-484)
Current waterfall structure depends on step return value to determine whether to progress to the next test step.

[CL 2573012 by Adric Worley in Main branch]
2015-06-01 16:19:30 -04:00
Richard TalbotWatkin
3b33869a71 Fixed crash converting texture sample to parameter when MipValue is set to "Level" or "Bias".
#jira UE-16181 - UDN: Crash: Converting Texture Sample to Parameter when MipValue set to "Level" or "Bias"

[CL 2568380 by Richard TalbotWatkin in Main branch]
2015-05-28 09:07:21 -04:00
Jamie Dale
837ec025dd Added overrides for GetToolkitToolTipText where required
UE-16078 - Crash hovering over texture reference in material

A lot of asset editors were overriding GetToolkitName to implement custom logic (sometimes because the default logic would cause a crash), and these asset editors now also need to override GetToolkitToolTipText too.

[CL 2564832 by Jamie Dale in Main branch]
2015-05-26 09:14:55 -04:00
bradgrantham
c3e1660cdc PR #1168: Added hooks to Material Editor for plugin support (Contributed by bradgrantham)
[CL 2561139 by Matt Kuhlenschmidt in Main branch]
2015-05-21 14:20:41 -04:00
Matt Kuhlenschmidt
0fcf076ff3 Guard against crash drawing a material editor who has been destroyed before its viewport has been.
[CL 2561130 by Matt Kuhlenschmidt in Main branch]
2015-05-21 14:15:44 -04:00
Richard TalbotWatkin
3cb9d92e18 Backed out CL 2502504 and CL 2472018. This needs a different fix.
#jira UE-15101 - Re-importing a texture recompiles any open material that references it

[CL 2548945 by Richard TalbotWatkin in Main branch]
2015-05-13 10:34:08 -04:00
Adric Worley
3fdb623e05 Moved MaterialEditor promotion tests into that module.
Removed MinimalAPI from UMaterialGraph and exposed the whole class.

[CL 2545311 by Adric Worley in Main branch]
2015-05-11 09:01:34 -04:00
Michael Schoell
db9c8e2240 UProperty and UFunction metadata for Category can now be localized and have improved FText usage throughout the editor (Blueprints, Behavior Trees, Materials, etc).
Big conversion of FStrings and FNames to FText.

Version bump to move some MaterialFunction UProperty from a TArray<FString> to TArray<FText> (some Engine assets are older than being allowed to auto-convert the UProperty)

Auto conversion of FName to FText (and back) now supported (as well as TArrays of those types).

Searching categories by both the localized string and the source string is now supported in Blueprints.

#jira UE-14481 - We are missing ability to translate node categories

#codereview Justin.Sargent

[CL 2542875 by Michael Schoell in Main branch]
2015-05-08 10:46:42 -04:00
Richard TalbotWatkin
d42b467966 Fix so that material instance instances in placed meshes are not affected when a parent's parameter name is changed.
#jira UE-8392 - Renaming Parameters resets all Instances in Level and Thumbnails

[CL 2533697 by Richard TalbotWatkin in Main branch]
2015-05-01 11:01:10 -04:00