[Bf-blender-cvs] [facc7658db9] fracture_modifier: crash fixes, was accessing non-existing layers

[Martin Felke]

Commit: facc7658db910ceac49d621206150d4df556819c
Author: Martin Felke
Date:   Thu Jan 4 20:44:02 2018 +0100
Branches: fracture_modifier
https://developer.blender.org/rBfacc7658db910ceac49d621206150d4df556819c

crash fixes, was accessing non-existing layers

===================================================================

M	intern/cycles/blender/blender_mesh.cpp
M	source/blender/blenkernel/intern/fracture.c

===================================================================

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index f5186a547ac..98bed494597 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -983,7 +983,6 @@ static bool sync_mesh_precalculated_motion(BL::Mesh& b_mesh, BL::Scene& b_scene,
 
 			//printf("Vel %f %f %f\n", (double)x, (double)y, (double)z);
 			mP[i] = P[i] + make_float3(x, y, z) * relative_time;
-			x = 1;
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 5431ce525bb..1d70868edd6 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -3765,9 +3765,6 @@ void BKE_update_velocity_layer(FractureModifierData *fmd, MeshIsland *mi)
 	//XXX how to represent this in mblur ?
 	//zero_v3(rbo->ang_vel);
 
-	//if (!velX || !velY || !velZ)
-	//	return;
-
 	for (i = 0; i < mi->vertex_count; i++)
 	{
 		if (t)
@@ -3784,6 +3781,9 @@ void BKE_update_velocity_layer(FractureModifierData *fmd, MeshIsland *mi)
 			sZ[i] = rbo->lin_vel[2] + rbo->ang_vel[2];
 		}
 
+		if (!velX || !velY || !velZ)
+			continue;
+
 		velX[mi->vertex_indices[i]] = rbo->lin_vel[0] + rbo->ang_vel[0];
 		velY[mi->vertex_indices[i]] = rbo->lin_vel[1] + rbo->ang_vel[1];
 		velZ[mi->vertex_indices[i]] = rbo->lin_vel[2] + rbo->ang_vel[2];