Commit Graph

185 Commits

Author SHA1 Message Date
Dmitry Rekman
a9221dfcb5 Matching LOCTEXT_NAMESPACE #def/#undef
- Also changed some #undef's to be more uniform

[CL 2665419 by Dmitry Rekman in Main branch]
2015-08-23 00:57:30 -04:00
Dan Oconnor
d8824fccd9 Experimental support for Widget and Anim blueprint diffing
#jira UE-6303

[CL 2663775 by Dan Oconnor in Main branch]
2015-08-20 20:40:10 -04:00
Lina Halper
e77ff42443 #ANIM: fix retarget option to support naming option
Merging

//depot/UE4-Orion/Engine/Source/...

to //depot/UE4/Engine/Source/...

[CL 2663029 by Lina Halper in Main branch]
2015-08-20 13:29:36 -04:00
Andrew Rodham
1bb27e3999 Added customization for FAssetImportInfo
- FAssetImportInfo is now marked as USTRUCT and is stored as a member value on UAssetImportData rather than using inheritance. This makes customization writing much easier and better affords UObject interoperability.
 - Removed UAssetImportData::bDirty as it was only every used to enable/disable a button on the static mesh editor, and its presence caused confusion and inconsistency.
 - Fixed issue where timestamps did not get updated correctly
 - Fixed various reimport paths that were not updating their source file information correctly.

This addresses UETOOL-466 and UE-16406.

[CL 2646395 by Andrew Rodham in Main branch]
2015-08-06 10:04:50 -04:00
Jaroslaw Palczynski
2c16d2b417 FStringAssetReference fixes.
All changes regarding e-mail discussion titled "Asset registry shenanigans".

Changes:
1. Engine now actively is getting rid of short asset paths in FStringAssetReference during saving (for all packages) and loading (only for older packages).
2. Deprecated direct access to FStringAssetReference.AssetLongPathname and exposed it via ToString and SetPath -- SetPath is making sure the path is in correct format. If the path can't be found on disk, the path is cleared.
3. Also access to FStringAssetReference.AssetLongPathnam via Blueprints is guarded using custom Make node function that uses SetPath instead of simple assign.
4. StringAssetReferenceMap will now contain only paths to packages (not objects) and ini references
5. GetDependencies now has additional parameter that lets you chose if it should resolve ini references or not. It was left not as default to keep old behaviour.

[CL 2630589 by Jaroslaw Palczynski in Main branch]
2015-07-23 10:49:29 -04:00
Max Preussner
1c200b1d2f Editor: Added missing forward declarations, headers, documentation
[CL 2626985 by Max Preussner in Main branch]
2015-07-20 23:09:05 -04:00
Robert Manuszewski
9ba5059023 Fixing a crash after renaming a map or asset that couldn't have been renamed due to errors.
UE-18417

[CL 2624588 by Robert Manuszewski in Main branch]
2015-07-17 14:04:31 -04:00
Matt Kuhlenschmidt
3100f0b2b9 Fix a crash when importing multiple objects with the same name at the same time when one of them is an FBX file.
https://jira.ol.epicgames.net/browse/UE-18687

[CL 2624497 by Matt Kuhlenschmidt in Main branch]
2015-07-17 13:17:31 -04:00
Lina Halper
1f31b1aec2 Fixed issues with retargeting when source skeleton is missing or target skeleton is missing preview mesh
https://jira.ol.epicgames.net/browse/UE-14149
https://jira.ol.epicgames.net/browse/UE-4638
https://jira.ol.epicgames.net/browse/UE-4484

[CL 2617109 by Lina Halper in Main branch]
2015-07-10 15:41:25 -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
Jamie Dale
b97258a833 Fixed Paper2D JSON files no longer importing as Paper2D assets
Data Tables can now import from JSON, and this was taking priority over the Paper2D importers. There were a few issues here:

1) FAssetTools::ImportAssets wasn't respecting the priority of the import factories, and was just testing them in the order they were found.
    a) UCSVImportFactory needed to be given a lower than normal priority so it gets tested last as it will perform a catch-all match.

2) FAssetTools::ImportAssets will default to the first factory it finds, and then use FactoryCanImport to try and find a better match, however FactoryCanImport returns false by default, so...
    a) UPaperSpriteSheetImportFactory needed to implement FactoryCanImport to avoid sprite sheets being imported as Data Tables.
    b) UCSVImportFactory needed to implement a catch-all FactoryCanImport so it can be used when no other factory is a better match.

#codereview Andrew.Rodham, Michael.Noland

[CL 2608928 by Jamie Dale in Main branch]
2015-07-02 08:42:08 -04:00
Richard TalbotWatkin
9fff2678c7 Fixed issue where sometimes redirector fixup needed to be run twice in order to complete successfully.
#jira UE-17417 - User must run FixUp Redirector two times to complete operation

Added referencing assets' paths into the list in FAssetFixUpRedirectors::UpdateAssetReferencers so that the asset references lists are updated correctly.
Also fixed a problem leading to duplicate entries in the PendingDeletes list in FAssetDeleteModel.

[CL 2605630 by Richard TalbotWatkin in Main branch]
2015-06-30 09:52:55 -04:00
Jamie Dale
8e1264a232 Made collections robust against moving or renaming assets and classes
UETOOL-332 - Collections 2.0
UETOOL-373 - Check robustness of Collections 2.0

The collection manager will now fix-up any references to redirectors within its collections once the asset registry has finished discovering all the available assets. It also adds a watcher so it can pick up any moves or deletes as they happen.

All of this fix-up is applied to the in-memory copy of the collection, and doesn't get persisted to disk until it needs to be (because referenced redirectors are being deleted). This helps to minimize issues with source control availability and shared/private collections.

This change also makes sure that objects that are being referenced by a collection will leave a redirector behind, and also adds some extra context (such as the collection name) to some of the source control errors that may be reported when saving a collection.

[CL 2602519 by Jamie Dale in Main branch]
2015-06-26 13:13:02 -04:00
Michael Noland
cdb09ec7d8 Animation: Added the AnimBP class thumbnail in the corner of the 3D thumnail for animation blueprint assets in the Content Browser
[CL 2601456 by Michael Noland in Main branch]
2015-06-25 17:57:23 -04:00
Martin Mittring
b14265f94a Improved Blendables, exposed weight on each blendable entry, better blueprint access, Outer=package/object
base for a change to replace all PostProcessSettings with Blendables. See new documentation on blendables.

[CL 2596231 by Martin Mittring in Main branch]
2015-06-22 18:03:15 -04:00
Laurent Delayen
043bc08ff4 [AUTOMERGE]
If you import a mesh that adds bones to a skeleton, but don't save the skeleton, it could cause a crash.
Added the ability to recover these bones in the editor.

#codereview lina.halper, martin.wilson

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2583044 by Laurent.Delayen on 2015/06/10 14:22:26.

[CL 2583061 by Laurent Delayen in Main branch]
2015-06-10 14:32:37 -04:00
Mieszko Zielinski
0be96565ff extracted EAssetTypeCategories into a separate header so that it can be cleanly used by other modules #UE4
[CL 2582425 by Mieszko Zielinski in Main branch]
2015-06-10 05:19:42 -04:00
Andrew Rodham
30036469e8 Added code to ensure that AssetImportData is valid in the editor, and added null checks for code that can be executed outside of the editor.
This further addresses UE-16277.

[CL 2570490 by Andrew Rodham in Main branch]
2015-05-29 10:29:46 -04:00
Andrew Rodham
93e71b9e6a Unified asset import data across all asset types.
The majority of asset reimport machinery is now held within UAssetImportData and FAssetImportInfo. This change allows us to remove the CachedAssetsBySourceFileName map from FAssetRegistry that was previously added to support auto reimport for 4.7.

The functionality of CachedAssetsBySourceFileName has been wrapped up in FAssetSourceFilenameCache, which sits on top of the asset registry in the editor.

This unification allows us to also consistently store the file timestamps and MD5 hashes of imported files. This subsequently allows auto-reimports to be ignored where a source content file has not actually changed (its MD5 is the same).

This addresses UETOOL-365 - Rework AssetRegistry changes to support auto-reimport

[CL 2567286 by Andrew Rodham in Main branch]
2015-05-27 16:16:21 -04:00
Richard TalbotWatkin
df11941a8b Fix to Redirector Fixup so that redirectors are deleted cleanly and referencing map packages are loaded.
#jira UE-14559 - Fixup Redirectors doesn't work in the editor

[CL 2566460 by Richard TalbotWatkin in Main branch]
2015-05-27 07:47:06 -04:00
zoon
dac8dc638e PR #1184: FIX Animation Sequence 'Reimport With new Source' context action (Contributed by zoon)
[CL 2565222 by Matt Kuhlenschmidt in Main branch]
2015-05-26 13:27:35 -04:00
Richard TalbotWatkin
5608d150bf Fixed issue where creating a child of an anim blueprint would result in a regular blueprint being created. Also fixed a similar issue with GameplayAbilityBlueprints.
#jira UE-15787 - Creating a child blueprint of an anim blueprint does not result in an anim blueprint
#reviewedby Benn.Gallagher

[CL 2558443 by Richard TalbotWatkin in Main branch]
2015-05-20 07:23:37 -04:00
Marc Audy
f6e82cc12c Fix crash when creating unique asset name if the source name was entirely numeric
[CL 2548912 by Marc Audy in Main branch]
2015-05-13 10:16:14 -04:00
Dan Hertzka
537d3361b7 [UE-14155]:
- An existing local foliage type assigned to the same mesh is no longer stomped by proc foliage from a blueprint class
- Added limited support for foliage type blueprints to the foliage palette
- Properties cannot be edited in the palette, but any changes to the BP propagate to the corresponding instances in the world. In general, using FoliageType assets for proc foliage is still recommended.
- No longer possible to assign the same mesh to multiple local foliage types
- Added source asset info to foliage palette item tooltips

- Local foliage types are now transactional
- Updated asset color for proc foliage spawner and foliage type

[CL 2539880 by Dan Hertzka in Main branch]
2015-05-06 16:37:21 -04:00
Dan Hertzka
dd74179c7a [UE-1518] - Simple hookup of new editor icons
[CL 2532543 by Dan Hertzka in Main branch]
2015-04-30 16:52:00 -04:00