[Bf-blender-cvs] [697566e] fluid-mantaflow: sanity check in liquid mesh create function. prevents crashes

Sebastián Barschkis noreply at git.blender.org
Mon Jul 4 00:09:56 CEST 2016


Commit: 697566e5c9bbdcea266b82302062f97b14f7dbc8
Author: Sebastián Barschkis
Date:   Sun Jul 3 21:18:50 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB697566e5c9bbdcea266b82302062f97b14f7dbc8

sanity check in liquid mesh create function. prevents crashes

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

M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index c3e5bb9..a8b90d0 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2850,9 +2850,14 @@ static DerivedMesh *createLiquidMesh(SmokeDomainSettings *sds, DerivedMesh *orgd
 	const char mp_flag    = mp_example.flag;
 	
 	int i;
-	int num_verts   = liquid_get_num_verts(sds->fluid);
-	int num_normals = liquid_get_num_normals(sds->fluid);
-	int num_faces   = liquid_get_num_triangles(sds->fluid);
+	int num_verts, num_normals, num_faces;
+	
+	if (!sds->fluid)
+		return NULL;
+	
+	num_verts   = liquid_get_num_verts(sds->fluid);
+	num_normals = liquid_get_num_normals(sds->fluid);
+	num_faces   = liquid_get_num_triangles(sds->fluid);
 	
 	if (!num_verts || !num_normals || !num_faces)
 		return NULL;




More information about the Bf-blender-cvs mailing list