Skip to content

Commit bbe9ffa

Browse files
committed
Fixed unsafe use of temporary variables.
1 parent 9510d23 commit bbe9ffa

2 files changed

Lines changed: 21 additions & 40 deletions

File tree

Source/HoudiniEngine/Private/UnrealMeshTranslator.cpp

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,8 @@ FUnrealMeshTranslator::HapiCreateInputNodeForStaticMesh(
440440
if (UseMergeNode)
441441
{
442442
// Create a new input node for the current LOD
443-
const char * LODName = "";
444-
{
445-
FString LOD = TEXT("lod") + FString::FromInt(LODIndex);
446-
LODName = H_TCHAR_TO_UTF8(*LOD);
447-
}
443+
444+
FString LODName = TEXT("lod") + FString::FromInt(LODIndex);
448445

449446
// Create the node in this input object's OBJ node
450447
HOUDINI_CHECK_ERROR_RETURN( FHoudiniEngineUtils::CreateNode(
@@ -3400,13 +3397,11 @@ FUnrealMeshTranslator::CreateInputNodeForBox(
34003397
// Set its group name param to collision_geo_simple_box
34013398
HAPI_ParmInfo ParmInfo;
34023399
HAPI_ParmId parmId = FHoudiniEngineUtils::HapiFindParameterByName(GroupNodeId, "groupname", ParmInfo);
3403-
const char * GroupNameStr = "";
3404-
{
3405-
FString LODGroup = TEXT("collision_geo_simple_box") + FString::FromInt(ColliderIndex);
3406-
GroupNameStr = H_TCHAR_TO_UTF8(*LODGroup);
3407-
}
3400+
3401+
FString LODGroup = TEXT("collision_geo_simple_box") + FString::FromInt(ColliderIndex);
3402+
34083403
FHoudiniApi::SetParmStringValue(
3409-
FHoudiniEngine::Get().GetSession(), GroupNodeId, GroupNameStr, parmId, 0);
3404+
FHoudiniEngine::Get().GetSession(), GroupNodeId, H_TCHAR_TO_UTF8(*LODGroup), parmId, 0);
34103405

34113406
// Connect the box to the group
34123407
FHoudiniApi::ConnectNodeInput(
@@ -3426,11 +3421,7 @@ FUnrealMeshTranslator::CreateInputNodeForSphere(
34263421
const float& SphereRadius)
34273422
{
34283423
// Create a new input node for the sphere collider
3429-
const char * SphereName = "";
3430-
{
3431-
FString SPH = TEXT("Sphere") + FString::FromInt(ColliderIndex);
3432-
SphereName = H_TCHAR_TO_UTF8(*SPH);
3433-
}
3424+
FString SphereName = TEXT("Sphere") + FString::FromInt(ColliderIndex);
34343425

34353426
// Create the node in this input object's OBJ node
34363427
HAPI_NodeId SphereNodeId = -1;
@@ -3471,13 +3462,11 @@ FUnrealMeshTranslator::CreateInputNodeForSphere(
34713462
// Set its group name param to collision_geo_simple_box
34723463
HAPI_ParmInfo ParmInfo;
34733464
HAPI_ParmId parmId = FHoudiniEngineUtils::HapiFindParameterByName(GroupNodeId, "groupname", ParmInfo);
3474-
const char * GroupNameStr = "";
3475-
{
3476-
FString LODGroup = TEXT("collision_geo_simple_sphere") + FString::FromInt(ColliderIndex);
3477-
GroupNameStr = H_TCHAR_TO_UTF8(*LODGroup);
3478-
}
3465+
3466+
FString LODGroup = TEXT("collision_geo_simple_sphere") + FString::FromInt(ColliderIndex);
3467+
34793468
FHoudiniApi::SetParmStringValue(
3480-
FHoudiniEngine::Get().GetSession(), GroupNodeId, GroupNameStr, parmId, 0);
3469+
FHoudiniEngine::Get().GetSession(), GroupNodeId, H_TCHAR_TO_UTF8(*LODGroup), parmId, 0);
34813470

34823471
// Connect the box to the group
34833472
FHoudiniApi::ConnectNodeInput(
@@ -3607,13 +3596,11 @@ FUnrealMeshTranslator::CreateInputNodeForSphyl(
36073596
// Set its group name param to collision_geo_simple_box
36083597
HAPI_ParmInfo ParmInfo;
36093598
HAPI_ParmId parmId = FHoudiniEngineUtils::HapiFindParameterByName(GroupNodeId, "groupname", ParmInfo);
3610-
const char * GroupNameStr = "";
3611-
{
3612-
FString LODGroup = TEXT("collision_geo_simple_capsule") + FString::FromInt(ColliderIndex);
3613-
GroupNameStr = H_TCHAR_TO_UTF8(*LODGroup);
3614-
}
3599+
3600+
FString LODGroup = TEXT("collision_geo_simple_capsule") + FString::FromInt(ColliderIndex);
3601+
36153602
FHoudiniApi::SetParmStringValue(
3616-
FHoudiniEngine::Get().GetSession(), GroupNodeId, GroupNameStr, parmId, 0);
3603+
FHoudiniEngine::Get().GetSession(), GroupNodeId, H_TCHAR_TO_UTF8(*LODGroup), parmId, 0);
36173604

36183605
// Connect the box to the group
36193606
FHoudiniApi::ConnectNodeInput(
@@ -3752,13 +3739,11 @@ FUnrealMeshTranslator::CreateInputNodeForConvex(
37523739
// Set its group name param to collision_geo_simple_ucx
37533740
HAPI_ParmInfo ParmInfo;
37543741
HAPI_ParmId parmId = FHoudiniEngineUtils::HapiFindParameterByName(GroupNodeId, "groupname", ParmInfo);
3755-
const char * GroupNameStr = "";
3756-
{
3757-
FString LODGroup = TEXT("collision_geo_simple_ucx") + FString::FromInt(ColliderIndex);
3758-
GroupNameStr = H_TCHAR_TO_UTF8(*LODGroup);
3759-
}
3742+
3743+
FString LODGroup = TEXT("collision_geo_simple_ucx") + FString::FromInt(ColliderIndex);
3744+
37603745
FHoudiniApi::SetParmStringValue(
3761-
FHoudiniEngine::Get().GetSession(), GroupNodeId, GroupNameStr, parmId, 0);
3746+
FHoudiniEngine::Get().GetSession(), GroupNodeId, H_TCHAR_TO_UTF8(*LODGroup), parmId, 0);
37623747

37633748
// Create a convex hull (shrinkwrap::2.0) node to fix the lack of proper indices
37643749
HAPI_NodeId ConvexHullNodeId = -1;

Source/HoudiniEngine/Private/UnrealSkeletalMeshTranslator.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,15 +495,11 @@ FUnrealSkeletalMeshTranslator::CreateInputNodesForSkeletalMesh(
495495
if (UseMergeNode)
496496
{
497497
// Create a new input node for the current LOD
498-
const char* LODName = "";
499-
{
500-
FString LOD = TEXT("lod") + FString::FromInt(LODIndex);
501-
LODName = H_TCHAR_TO_UTF8(*LOD);
502-
}
498+
FString LODName = TEXT("lod") + FString::FromInt(LODIndex);
503499

504500
// Create the node in this input object's OBJ node
505501
HOUDINI_CHECK_ERROR_RETURN(FHoudiniEngineUtils::CreateNode(
506-
InputObjectNodeId, TEXT("null"), LODName, false, &CurrentLODNodeId), false);
502+
InputObjectNodeId, TEXT("null"), H_TCHAR_TO_UTF8(*LODName), false, &CurrentLODNodeId), false);
507503
}
508504
else
509505
{

0 commit comments

Comments
 (0)