Commit Graph

12094 Commits

Author SHA1 Message Date
Marc Audy
8df336162c Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) @ 8782600
#rb
#rnx

[CL 8783278 by Marc Audy in Main branch]
2019-09-17 19:12:19 -04:00
patrick enfedaque
2fe830dadd Better Fix : SetLODDataCount to StaticMesh LOD Count
#jira UE-80393
[FYI] jason.stasik


#ROBOMERGE-SOURCE: CL 8740502 via CL 8740567 via CL 8748495
#ROBOMERGE-BOT: (v422-8689730)

[CL 8748626 by patrick enfedaque in Main branch]
2019-09-17 11:01:06 -04:00
hongyi yu
c29da8d9ec AssetRegUtilCommandlet now supports generate partially updated file open order
#rb Daniel.Lamb


#ROBOMERGE-SOURCE: CL 8698017 via CL 8708088
#ROBOMERGE-BOT: (v422-8689730)

[CL 8709094 by hongyi yu in Main branch]
2019-09-16 21:14:54 -04:00
patrick enfedaque
7e2cf67a51 Fix crash when Mesh painting SplineMeshComponent
#jira UE-80393
#rb jason.stasik
[FYI] tim.gautier
#rnx


#ROBOMERGE-SOURCE: CL 8696823 via CL 8697751 via CL 8708001
#ROBOMERGE-BOT: (v422-8689730)

[CL 8709031 by patrick enfedaque in Main branch]
2019-09-16 21:13:37 -04:00
tommybear
f353ebe9f1 PR #6222: Fix crash in ChangeTabWorld when TearDownWorld occurs (Contributed by tommybear)
#jira UE-80411
#rb me
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 8704525 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v422-8689730)

[CL 8704541 by Lauren Barnes in Main branch]
2019-09-16 17:25:30 -04:00
patrick enfedaque
b9b021572d Foliage: Fix exclude crash with null IFA.
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8695819 via CL 8695827 via CL 8703359
#ROBOMERGE-BOT: (v422-8689730)

[CL 8703514 by patrick enfedaque in Main branch]
2019-09-16 16:39:18 -04:00
sebastien lussier
ae47d782c2 HLOD CalculateOverlap crashes when spheres barely overlap
#jira UE-80400
#rb patrick.enfedaque


#ROBOMERGE-SOURCE: CL 8695613 via CL 8703310
#ROBOMERGE-BOT: (v422-8689730)

[CL 8703467 by sebastien lussier in Main branch]
2019-09-16 16:38:36 -04:00
patrick enfedaque
cd6e592483 Fix check when switching selection between two landscapes in scene outliner
#jira UE-80347
#rb richard.malo


#ROBOMERGE-SOURCE: CL 8690557 via CL 8700980
#ROBOMERGE-BOT: (v422-8689730)

[CL 8701194 by patrick enfedaque in Main branch]
2019-09-16 16:18:16 -04:00
sebastien lussier
f5dab33076 HLOD System - HLOD 0 is visible while HLOD 1 is visible
#jira UE-75006

Fixed a few HLOD cluster generation options combinations


#ROBOMERGE-SOURCE: CL 8690507 via CL 8700951
#ROBOMERGE-BOT: (v422-8689730)

[CL 8701170 by sebastien lussier in Main branch]
2019-09-16 16:18:02 -04:00
sebastian nordgren
e6232ae5e2 Fixed compiler errors caused by mismerge in CL 8686367.
#rb paul.chipchase

#jira UE-80025

#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8693005 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v422-8689730)

[CL 8693043 by sebastian nordgren in Main branch]
2019-09-16 11:35:21 -04:00
thomas sarkanen
8e225aa3f0 Fixed linux compile error
#rb none
#rnx


#ROBOMERGE-OWNER: thomas.sarkanen
#ROBOMERGE-AUTHOR: braeden.shosa
#ROBOMERGE-SOURCE: CL 8681827 via CL 8688664
#ROBOMERGE-BOT: (v422-8689730)

[CL 8692986 by thomas sarkanen in Main branch]
2019-09-16 11:34:13 -04:00
sebastian nordgren
523135f31f Fixed an invalid bounds check in ItemPropertyNode::GetValueBaseAddress when fetching the base address for a property in an array. For example, the CDO of an object may not contain a value at a given array index, but still contain some elements.
#rb chris.gagnon

#jira UE-78911
#jira UE-80317

#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8692233 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v422-8689730)

[CL 8692249 by sebastian nordgren in Main branch]
2019-09-16 10:36:47 -04:00
jamie dale
a287480c36 Allow FString instances containing code units outside of the basic multilingual plane to be losslessly processed regardless of whether TCHAR is 2 or 4 bytes.
Most UE4 platforms use a 2-byte TCHAR, however some still use a 4-byte TCHAR. The platforms that use a 4-byte TCHAR expect their string data to be UTF-32, however there are parts of UE4 that serialize FString data as a series of UCS2CHAR, simply narrowing or widening each TCHAR in turn. This can result in invalid or corrupted UTF-32 strings (either UTF-32 strings containing UTF-16 surrogates, or UTF-32 code points that have been truncated to 2-bytes), which leads to either odd behavior or crashes.

This change updates the parts of UE4 that process FString data as a series of 2-byte values to do so on the correct UTF-16 interpretation of the data, converting to/from UTF-32 as required on platforms that use a 4-byte TCHAR. This conversion is a no-op on platforms that use a 2-byte TCHAR as the string is already assumed to be valid UTF-16 data. It should also be noted that while FString may contain UTF-16 code units on platforms using a 2-byte TCHAR, this change doesn't do anything to make FString represent a Unicode string on those platforms (ie, a string that understands and works on code points), but is rather just a bag of code units.

Two new variable-width string converters have be added to facilitate the conversion (modelled after the TCHAR<->UTF-8 converters), TUTF16ToUTF32_Convert and TUTF32ToUTF16_Convert. These are used for both TCHAR<->UTF16CHAR conversion when needed, but also for TCHAR<->wchar_t conversion on platforms that use char16_t for TCHAR along with having a 4-byte wchar_t (as defined by the new PLATFORM_WCHAR_IS_4_BYTES option).

These conversion routines are accessed either via the conversion macros (TCHAR_TO_UTF16, UTF16_TO_TCHAR, TCHAR_TO_WCHAR, and WCHAR_TO_TCHAR), or by using a conversion struct (FTCHARToUTF16, FUTF16ToTCHAR, FTCHARToWChar, and FWCharToTCHAR), which is the same pattern as the existing TCHAR<->UTF-8 conversion. Both the macros and the structs are defined as no-ops when the conversion isn't needed, but always exist so that code can be written in a portable way.

Very little code actually needed updating to use UTF-16, as the vast majority makes no assumptions about the size of TCHAR, nor how FString should be serialized. The main places were the FString archive serialization and the JSON reader/writer, along with some minor fixes to the UTF-8 conversion logic for platforms using a 4-byte TCHAR.

Tests have been added to verify that an FString representing a UTF-32 code point can be losslessly converted to/from UTF-8 and UTF-16, and serialized to/from an archive.

#jira
#rb Steve.Robb, Josh.Adams


#ROBOMERGE-SOURCE: CL 8676728 via CL 8687863
#ROBOMERGE-BOT: (v421-8677696)

[CL 8688048 by jamie dale in Main branch]
2019-09-16 05:44:11 -04:00
matt kuhlenschmidt
e8c7d11bd2 Force world subsystems to initialize if the world was inactive (due to loading in the content browser) and becoming the active world
#rb chris.gagnon


#ROBOMERGE-SOURCE: CL 8675446 via CL 8675447 via CL 8687243
#ROBOMERGE-BOT: (v421-8677696)

[CL 8687393 by matt kuhlenschmidt in Main branch]
2019-09-16 05:30:33 -04:00
sebastian nordgren
a35c4df23d Force Deleting an asset now closes all asset editors that reference that object.
#jira UE-80025

#rb chris.gagnon

#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8686367 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v421-8677696)

[CL 8686368 by sebastian nordgren in Main branch]
2019-09-16 03:55:19 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Brandon Schaefer
10aebf8961 Fix CIS deprecation warnings on GIsRequestingExit
#jira UE-80297
#rb none

[CL 8681428 by Brandon Schaefer in Main branch]
2019-09-13 17:08:19 -04:00
Brandon Schaefer
30dc05c345 Fix compile error: '&&' within '||' [-Werror,-Wlogical-op-parentheses]
#jira none
#rb none
#fyi braeden.shosa

[CL 8681184 by Brandon Schaefer in Main branch]
2019-09-13 16:59:27 -04:00
max chen
b27b329302 Sequencer: Fix unitialized variables which was causing doubling or undefined values when keying transforms
#jira UE-80333
#rb matt.hoffman
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8680881 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v417-8656536)

[CL 8680903 by max chen in Main branch]
2019-09-13 16:51:14 -04:00
patrick enfedaque
1f2d4a81fa Foliage Actor: Option to Include Actors into Foliage & Exclude Actors from Foliage
#rb jeanfrancois.dube
#rnx


#ROBOMERGE-SOURCE: CL 8673040 via CL 8673042 via CL 8676065
#ROBOMERGE-BOT: (v417-8656536)

[CL 8676177 by patrick enfedaque in Main branch]
2019-09-13 13:58:13 -04:00
nicolas nebel
12bea1f911 Add missing include in SplineComponentVisualizer.cpp
#rb none


#ROBOMERGE-SOURCE: CL 8657457 via CL 8667299
#ROBOMERGE-BOT: (v417-8656536)

[CL 8668382 by nicolas nebel in Main branch]
2019-09-12 20:14:33 -04:00
braeden shosa
687a571735 Fixed pointer use before verify static analysis warning
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8657027 via CL 8667256
#ROBOMERGE-BOT: (v417-8656536)

[CL 8667341 by braeden shosa in Main branch]
2019-09-12 19:24:18 -04:00
nicolas nebel
eb87176d9c Fix include cycle in SplineGeneratorPanel.h
#jira UE-80239
#rb none


#ROBOMERGE-SOURCE: CL 8656997 via CL 8667134
#ROBOMERGE-BOT: (v417-8656536)

[CL 8667231 by nicolas nebel in Main branch]
2019-09-12 19:22:27 -04:00
benoit deschenes
d721e09898 Fix crash at skeletal mesh export
#jira UE-80168
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8663691 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v417-8656536)

[CL 8663703 by benoit deschenes in Main branch]
2019-09-12 17:27:57 -04:00
Max Chen
72d2741cba Sequencer: Fix crash when opening animation section properties. Set the allowed class type.
#jira UE-80119
#rb none

[CL 8659227 by Max Chen in Main branch]
2019-09-12 14:57:05 -04:00