Possible NULL de-reference on fullsceen check

Also quiet some other minor warnings
2015-02-03 16:40:27 +11:00
parent 32125c40d3
commit faaaf7ee1f
4 changed files with 7 additions and 3 deletions
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -420,8 +420,9 @@ static void PE_create_shape_tree(PEData *data, Object *shapeob)
 	
 	memset(&data->shape_bvh, 0, sizeof(data->shape_bvh));
 	
-	if (!shapeob || !shapeob->derivedFinal)
+	if (!dm) {
 		return;
+	}
 	
 	DM_ensure_tessface(dm);
 	bvhtree_from_mesh_faces(&data->shape_bvh, dm, 0.0f, 4, 8);