[Bf-blender-cvs] [949be0f] fracture_modifier: change order of checked expressions in rigidbody object creation -> could crash on non-mesh object

[Martin Felke]

Commit: 949be0f50a748c1916d1072eb1714b22837db095
Author: Martin Felke
Date:   Thu Nov 13 22:43:08 2014 +0100
Branches: fracture_modifier
https://developer.blender.org/rB949be0f50a748c1916d1072eb1714b22837db095

change order of checked expressions in rigidbody object creation -> could crash on non-mesh object

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

M	source/blender/blenkernel/intern/rigidbody.c
M	source/blender/modifiers/intern/MOD_fracture.c

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index cbf4273..4f2c50a 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1941,7 +1941,7 @@ RigidBodyOb *BKE_rigidbody_create_shard(Scene *scene, Object *ob, MeshIsland *mi
 		return NULL;
 	}
 	
-	if ((((Mesh *)ob->data)->totvert == 0) && (ob->type == OB_MESH)) {
+	if ((ob->type == OB_MESH) && (((Mesh *)ob->data)->totvert == 0)) {
 		return NULL;
 	}
 
diff --git a/source/blender/modifiers/intern/MOD_fracture.c b/source/blender/modifiers/intern/MOD_fracture.c
index 7165524..77164f3 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -2734,7 +2734,7 @@ ModifierTypeInfo modifierType_Fracture = {
 	/* name */ "Fracture",
 	/* structName */ "FractureModifierData",
 	/* structSize */ sizeof(FractureModifierData),
-	/* type */ eModifierTypeType_Constructive,                 //eModifierTypeType_OnlyDeform,
+	/* type */  eModifierTypeType_Constructive,
 	/* flags */ eModifierTypeFlag_AcceptsMesh |
 	eModifierTypeFlag_AcceptsCVs |
 	eModifierTypeFlag_Single |