Commit Graph

170 Commits

Author SHA1 Message Date
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
Marc Audy
546fdae28a When creating unique asset name, avoid continually appending more numbers and instead increment them.
[CL 2530522 by Marc Audy in Main branch]
2015-04-29 14:08:08 -04:00
Michael Noland
882aee9c55 Content Browser: Added the ability to register new advanced categories without editing engine source
Paper2D: Defined a "Paper2D" category and moved existing asset type actions over

New methods on IAssetTools:
- RegisterAdvancedAssetCategory
- FindAdvancedAssetCategory
- GetAllAdvancedAssetCategories

Upgrade Note: This gets rid of the named extension sections in the filter menu, which should instead be extended via registering a new category.

[UE-13646]
#codereview bob.tellez

[CL 2525743 by Michael Noland in Main branch]
2015-04-25 14:49:25 -04:00
Richard TalbotWatkin
ee38b591f9 Change to "Create Child Blueprint Class" so that the new asset is created and set up for inline renaming in the Content Browser, instead of opening the Blueprint Editor with the default name.
#jira UE-11519 - Blueprints: RMB -> "Create Class based on this" in CB doesn't allow me to name the class

[CL 2517970 by Richard TalbotWatkin in Main branch]
2015-04-20 14:22:39 -04:00
Michael Noland
2db8b8e622 Audio: Removed the unused sound preview dialog and sound preview thread
#codereview marc.audy, aaron.mcleran

[CL 2515229 by Michael Noland in Main branch]
2015-04-16 19:46:53 -04:00
Jamie Dale
b44bca0ef0 Curve Table improvements
UETOOL-281 - Improve data table workflows

Added support for exporting to CSV and JSON
Added support for importing from JSON (as well as the existing CSV support)
Ported over the new data table editor look-and-feel
Curve table editor now refreshes if the curve table it's editing is re-imported

[CL 2514354 by Jamie Dale in Main branch]
2015-04-16 11:46:07 -04:00
Dan Hertzka
9559ed311a [UETOOL-266] - Procedural foliage assets & properties are hidden behind an experimental flag
[CL 2510835 by Dan Hertzka in Main branch]
2015-04-13 17:33:05 -04:00
Olaf Piesche
89375030fe Moved Niagara to its own module; made curve access work; fixed various small things
#codereview simon.tovey

[CL 2510645 by Olaf Piesche in Main branch]
2015-04-13 15:25:14 -04:00
Dan Hertzka
b7e4b5af2a [UETOOL-255] - Renamed "Foliage Settings" assets to "Foliage Type" to match their class name (and more clearly identify it as a specific type of foliage)
[CL 2508821 by Dan Hertzka in Main branch]
2015-04-10 15:51:45 -04:00
Richard TalbotWatkin
da67c07130 Fix issue where renamed assets were incorrectly absent from the "In Use By Level" filter in the Content Browser until toggling the filter on and off.
#jira UE-11567 - In Use By Level Filter disabled when renaming asset
#jira UE-11569 - Moving an asset In Use By Level is enabled will make it not visible in filter
#codereview Matt.Kuhlenschmidt

[CL 2508158 by Richard TalbotWatkin in Main branch]
2015-04-10 06:55:02 -04:00
Mike Fricker
114458bf0f Clang warning fixes: Fixed missing 'override' specifiers
- Also removed some unreferenced functions that adding 'override' revealed

PR #1002 -- Thank you, Omar007!

[CL 2498415 by Mike Fricker in Main branch]
2015-04-01 07:20:55 -04:00
Robert Manuszewski
8fe5db30e3 Merging UE4-Streaming to UE4
- Linkers are no longer UObjects. Renamed ULinker, ULinkerLoad and ULinkerSave to FLinker, FLinkerLoad, FLinkerSave respectively
- Linkers are now associated with their UPackages
- Linker version is now stored in UPackages
- Async loading is now performed on a separate thread (if platform supports it and only in cooked builds), with the exception of PostLoad which is still done on the game thread
- Added UObject::IsPostLoadThreadSafe() function to determine if PostLoad is thread safe and can be executed on the async loading thread (defaults to false)
- UObject creation is now thread safe and can be performed on any thread
- Move many of the linker/UObject globals into FUObjectThreadContext (TLS)
- GetAsyncLoadPercentage() now takes PostLoad into account
- More async loading stats
- Added AtomicallySetFlags/ClearFlags to UObject
- Made FModuleManager thread safe.
- Added FGCScopeGuard as means of preventing GC from executing from non-game thread
- It's possible to disable async loading thread through ini settings.
- Cancelling async loading will now also trigger GC
- Implemented a basic version of async streaming priorities.

Change 2410813 by Mikolaj Sieluzycki:
	Change Sleep in while loop to ConditionalSleep in FMultiReaderSingleWriterGT
Change 2410734 by Mikolaj Sieluzycki:
	Make FModuleManager thread safe.
Change 2399879 by Mikolaj Sieluzycki:
	Basic version of async streaming priorities.
Change 2410707 by Mikolaj Sieluzycki:
	Implement conditional and no stat versions of sleep.
Change 2371939 by Robert Manuszewski:
	Async Loading Improvements: adding more stats (accumulators)
Change 2372403 by Robert Manuszewski:
	Fixing compile errors when STATs are not enabled
Change 2371526 by Robert Manuszewski:
	AsyncLoading Improvements (WIP)
Change 2407198 by Robert Manuszewski:
	Re-implementing delegate fixes for Async Loading
Change 2407425 by Robert Manuszewski:
	Re-implementing cancelling async loading in the async loading branch.
Change 2484362 by Robert Manuszewski:
	Making it possible to disable async loading thread through ini settings.
Change 2484744 by Robert Manuszewski:
	Minimizing locks in GC and other threads when handling UObjects
Change 2480190 by Robert Manuszewski:
	Fixing infinite stall after canceling async loading in non-cooked builds
Change 2484268 by Robert Manuszewski:
	Fixing crash when allocating permanent object pool.
Change 2489761 by Robert Manuszewski:
	Fixing BulkData using linker archive on the main thread even if the linker was created on the async loading thread.
Change 2493624 by Robert Manuszewski:
	Cancelling async loading will now also trigger GC
Change 2487881 by Robert Manuszewski:
	Making ShaderIdMap operations thread safe.
Change 2488067 by Robert Manuszewski:
	Fixing GetAsyncLoadPercentage. It will now also respect PostLoad.
Change 2458640 by Robert Manuszewski:
	Fixing crash in PIE
Change 2458825 by Robert Manuszewski:
	Fixing a few crashes when streaming and the package is missing.
Change 2476935 by Robert Manuszewski:
	Fixing crash while async loading ANavigationData
Change 2477361 by Robert Manuszewski:
	Fixing crashes in cooked game
Change 2480095 by Robert Manuszewski:
	Making FUObjectArray more thread safe
Change 2475443 by Robert Manuszewski:
	Re-enabling single-threaded async loading path for the editor and platforms that don't support multithreading.
Change 2475458 by Robert Manuszewski:
	Making sure bulk data is only loaded on a separate thread if it's not being loaded on the async loading thread.
Change 2476661 by Robert Manuszewski:
	Fixing FlushAsyncLoading not flushing everything
Change 2401089 by Jaroslaw Surowiec:
	Core - Added AtomicallySetFlags/ClearFlags to UObject, added a comment to ThisThreadAtomicallyClearedRFUnreachable

[CL 2498249 by Robert Manuszewski in Main branch]
2015-04-01 03:03:18 -04:00
PaulEremeeff
3d878d5a79 PR #996: Fixing PVS-Studio warnings (Contributed by PaulEremeeff)
I have reviewed each change carefully, but it is a large change and I could have missed something! Here is a summary of the types of changes in this CL:
 * Made nullptr checks consistent (the plurality of the changes are of this type)
 * Completed switch statements (IE, switch did not explicitly handle default case, but had unhandled enum entries - this is the second most popular type of fix)
 * Removed unused variables
 * Removed redundant initializations
 * WidgetNavigationCustomization.cpp was fixed by the owner
 * integers converted to floats where result was stored in a float
 * Removed redundent null checks (e.g. before delete statements)
 * Renamed variables to prevent non-obvious shadowing
 * Fixed use of bitwise & when checking for equality to an enum entry (which is often 0)
 * Fixes for some copy paste errors (e.g. FoliageEdMode.cpp)

[CL 2498053 by Dan Oconnor in Main branch]
2015-03-31 20:12:31 -04:00
Michael Noland
73d8625fbb Editor: Added sanitization to the asset name in addition to the package name in FAssetTools::CreateUniqueAssetName
#codereview bob.tellez

[CL 2496012 by Michael Noland in Main branch]
2015-03-30 15:21:59 -04:00
Jamie Dale
6af0f20199 Data table improvements
UETOOL-281 - Improve data table workflows
UETOOL-282 - Data tables cannot be exported as CSV
UETOOL-289 - Data tables cannot represent arrays in their CSV data

Split up the util functions into their own file (DataTableUtils).
Split up the CSV exporting/importing into its own file (DataTableCSV).
Split up the JSON exporting/importing into its own file (DataTableJSON).
Added support for exporting/importing/displaying array properties.
Added the ability to export a data table as CSV.
Added the ability to import a data table from JSON.

[CL 2494005 by Jamie Dale in Main branch]
2015-03-27 12:29:42 -04:00
Chris Wood
fea90a7330 Importing multiple assets with the same name no longer crashes the editor.
[UE-1102] - CRASH: Importing an FBX and TGA at the same time causes the editor to crash

[CL 2493461 by Chris Wood in Main branch]
2015-03-27 05:31:50 -04:00