Commit Graph

347 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
Lauren Ridge
882abc56c8 Refactoring the majority of AssetEditorManager cases to AssetEditorSubsystem
#rb me

[CL 7765218 by Lauren Ridge in Dev-Editor branch]
2019-08-05 12:16:07 -04:00
Rex Hill
6f0fab96ac Rename Editor\EditorMenus\ module to Runtime\ToolMenus\ so that other modules can use the API without having to depend on editor modules.
#rb none
#rnx

[CL 7708568 by Rex Hill in Dev-Editor branch]
2019-08-02 13:45:24 -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
michael trepka
f7af6da126 Changes to make new Clang in Xcode 11 beta compile the engine witout warnings
#rb Josh.Adams
#jira UE-77043
[FYI] Peter.Sauerbrei, Ben.Marsh, Andrew.Grant

#ROBOMERGE-SOURCE: CL 7605175 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7605181 by michael trepka in Main branch]
2019-07-24 09:57:26 -04:00
lauren ridge
dff26797bc Fix for material instance with no parent being opened for edit
#jira UE-77671
#rb copiedCL
#rnx


#ROBOMERGE-OWNER: lauren.ridge
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7476839 via CL 7492270 via CL 7544868
#ROBOMERGE-BOT: (v372-7473910)

[CL 7544873 by lauren ridge in Main branch]
2019-07-23 10:45:09 -04:00
lauren ridge
9abb5931e2 Adding default text in case a parent material isn't found
#jira UE-77421
#rb trivial

#ROBOMERGE-SOURCE: CL 7427308 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7427321 by lauren ridge in Main branch]
2019-07-17 14:56:36 -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
jack porter
a913c14fcc Apply platform scalability settings when changing Preview Rendering Level
#rb Allan.Bentham


[CODEREVIEW] Jack.Porter, Rolando.Caloca, Josh.Adams


#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 7306462 via CL 7315035
#ROBOMERGE-BOT: (v371-7306989)

[CL 7318233 by jack porter in Main branch]
2019-07-16 01:31:34 -04:00
projectgheist
fae2d60ec2 PR #5862: Reword 'override original material' dialog to be clearer (Contributed by projectgheist)
#rb me

[CL 7309978 by Lauren Ridge in Dev-Editor branch]
2019-07-15 13:16:54 -04:00
Rex Hill
9c3ee35e3c Add include in MaterialInstanceEditor.cpp
#rb none
#rnx

[CL 7257593 by Rex Hill in Dev-Editor branch]
2019-07-09 20:15:46 -04:00
Rex Hill
6f631e4544 Material Instance Editor Hierarchy tool bar button refactored to avoid needing submenu for each item
#jira UE-76484
#rb lauren.ridge
#review-7069091 lauren.ridge

[CL 7248602 by Rex Hill in Dev-Editor branch]
2019-07-09 10:59:11 -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
lauren ridge
20df4e2412 Tweak to previous menu fix
#rb trivial
#jira trivial

#ROBOMERGE-SOURCE: CL 7228198 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7228202 by lauren ridge in Main branch]
2019-07-08 12:15:29 -04:00
Rex Hill
eb7a1fb524 Fix assert from missing EndSection() call in material editor toolbar
#rb lauren.ridge

[CL 7228188 by Rex Hill in Dev-Editor branch]
2019-07-08 12:12:02 -04:00
lauren ridge
52c36a5737 Fix for assert for missing EndSection call
#jira none
#rb Rex.Hill

#ROBOMERGE-SOURCE: CL 7228185 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7228186 by lauren ridge in Main branch]
2019-07-08 12:11:54 -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
uriel doyon
fbeabd378c Removed unrequired shader compilation when changing preview feature level.
Texture streaming accuracy visualization now show the current state of data, and doesn't need to build the texture streaming as a prestep.
#rb alexis.matte
#jira UE-76859

#ROBOMERGE-SOURCE: CL 7223779 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7223780 by uriel doyon in Main branch]
2019-07-04 13:00:49 -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
lauren ridge
b8f4f124ea Hiding material hierarchy in the material editor if editing a function, adding a "no instances found" item if there are no material instances
#jira UE-76656
#jira UE-76657
#rb trivial

#ROBOMERGE-SOURCE: CL 7110665 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7110681 by lauren ridge in Main branch]
2019-06-20 15:43:10 -04:00
lauren ridge
3de8bb78be Fixing Atlas Curve expression to use parameters so it handles atlas resizing correctly
#rb Chris.Bunner
#rnx
[FYI] Marcus.Wassmer, Bryan.Rathman


#ROBOMERGE-OWNER: lauren.ridge
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 7068709 via CL 7102336
#ROBOMERGE-BOT: (v367-6836689)

[CL 7102359 by lauren ridge in Main branch]
2019-06-20 10:20:00 -04:00
Jason Stasik
aa70895e48 Fix broken include
#jira none
#rb none

[CL 7096413 by Jason Stasik in Dev-Editor branch]
2019-06-19 15:42:58 -04:00
Lauren Ridge
a0fcbf9a88 Fixing missing include for non-unity/linux compile
#jira none
#rb none

[CL 7096054 by Lauren Ridge in Dev-Editor branch]
2019-06-19 15:12:51 -04:00
Lauren Ridge
8f606acbfa You can now use the advanced property Channel Names to label the R, G, B and A outputs of texture and vector parameters. These names will be visible in the material instance editor for instances of this material, as well as next to the pins for this expression.
#jira UE-62642
#rb Matt.Kuhlenschmidt

[CL 7095148 by Lauren Ridge in Dev-Editor branch]
2019-06-19 13:31:24 -04:00
rob gay
e7cc7cf9ed Minor fix to material editor alignment shortcut
#rb none


#ROBOMERGE-SOURCE: CL 6956868 via CL 6958242
#ROBOMERGE-BOT: (v367-6836689)

[CL 6971320 by rob gay in Main branch]
2019-06-13 12:01:30 -04:00