Fixed warnings

The BuildConfiguration default has been changed from warning to error.
mik14a · Mar 30, 2020 · 2aa01f6 · 2aa01f6
1 parent f53b80d
commit 2aa01f6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Source/VOX4U/Private/Voxel.cpp b/Source/VOX4U/Private/Voxel.cpp
@@ -27,8 +27,8 @@ void UVoxel::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChange
 void UVoxel::CalcCellBounds()
 {
 	FBoxSphereBounds Bounds(ForceInit);
-	for (const auto* Mesh : this->Mesh.FilterByPredicate([](UStaticMesh* m) { return !!m; })) {
-		Bounds = Bounds + Mesh->GetBounds();
+	for (const auto* Cell : Mesh.FilterByPredicate([](UStaticMesh* m) { return !!m; })) {
+		Bounds = Bounds + Cell->GetBounds();
 	}
 	CellBounds = Bounds;
 }

diff --git a/Source/VOX4U/Private/VoxelComponent.cpp b/Source/VOX4U/Private/VoxelComponent.cpp
@@ -27,14 +27,14 @@ void UVoxelComponent::PostEditChangeProperty(FPropertyChangedEvent& PropertyChan
 			ClearVoxel();
 			AddVoxel();
 		} else if (PropertyChangedEvent.Property->GetFName() == NAME_Mesh) {
-			FBoxSphereBounds Bounds(ForceInit);
+			FBoxSphereBounds MeshBounds(ForceInit);
 			for (int32 i = 0; i < Mesh.Num(); ++i) {
 				InstancedStaticMeshComponents[i]->SetStaticMesh(Mesh[i]);
 				if (Mesh[i]) {
-					Bounds = Bounds + Mesh[i]->GetBounds();
+					MeshBounds = MeshBounds + Mesh[i]->GetBounds();
 				}
 			}
-			CellBounds = Bounds;
+			CellBounds = MeshBounds;
 		} else if (PropertyChangedEvent.Property->GetFName() == NAME_Voxel) {
 			SetVoxel(Voxel, true);
 		}
@@ -126,11 +126,11 @@ bool UVoxelComponent::GetVoxelTransform(const FIntVector& InVector, FTransform&
 
 FBoxSphereBounds UVoxelComponent::CalcBounds(const FTransform& LocalToWorld) const
 {
-	FBoxSphereBounds Bounds = FBoxSphereBounds(ForceInit);
+	FBoxSphereBounds ComponentBounds = FBoxSphereBounds(ForceInit);
 	for (auto* InstancedStaticMeshComponent : InstancedStaticMeshComponents) {
-		Bounds = Bounds + InstancedStaticMeshComponent->CalcBounds(LocalToWorld);
+		ComponentBounds = ComponentBounds + InstancedStaticMeshComponent->CalcBounds(LocalToWorld);
 	}
-	return Bounds;
+	return ComponentBounds;
 }
 
 const TArray<UInstancedStaticMeshComponent*>& UVoxelComponent::GetInstancedStaticMeshComponent() const

diff --git a/Source/VOX4UEditor/Private/VoxelFactory.cpp b/Source/VOX4UEditor/Private/VoxelFactory.cpp
@@ -235,13 +235,13 @@ UDestructibleMesh* UVoxelFactory::CreateDestructibleMesh(UObject* InParent, FNam
 	BuildStaticMesh(RootMesh, RawMesh);
 	DestructibleMesh->SourceStaticMesh = RootMesh;
 
-	TArray<FRawMesh> RawMeshes;
-	Vox->CreateRawMeshes(RawMeshes, ImportOption);
+	TArray<FRawMesh> CellMeshes;
+	Vox->CreateRawMeshes(CellMeshes, ImportOption);
 	TArray<UStaticMesh*> FractureMeshes;
-	for (FRawMesh& RawMesh : RawMeshes) {
+	for (FRawMesh& CellMesh : CellMeshes) {
 		UStaticMesh* FructureMesh = NewObject<UStaticMesh>();
 		FructureMesh->StaticMaterials.Add(FStaticMaterial(Material));
-		BuildStaticMesh(FructureMesh, RawMesh);
+		BuildStaticMesh(FructureMesh, CellMesh);
 		FractureMeshes.Add(FructureMesh);
 	}
 	DestructibleMesh->SetupChunksFromStaticMeshes(FractureMeshes);