[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16973] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Bugfix #17767

Ton Roosendaal ton at blender.org
Wed Oct 8 18:29:09 CEST 2008


Revision: 16973
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16973
Author:   ton
Date:     2008-10-08 18:29:09 +0200 (Wed, 08 Oct 2008)

Log Message:
-----------
Bugfix #17767

NULL check missing in particle bvhtree testing.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-10-08 15:42:49 UTC (rev 16972)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-10-08 16:29:09 UTC (rev 16973)
@@ -3101,7 +3101,7 @@
 				col.md = ( CollisionModifierData * ) ( modifiers_findByType ( ec->ob, eModifierType_Collision ) );
 				col.ob_t = ob;
 
-				if(col.md->bvhtree)
+				if(col.md && col.md->bvhtree)
 					BLI_bvhtree_ray_cast(col.md->bvhtree, col.co1, ray_dir, radius, &hit, particle_intersect_face, &col);
 			}
 		}





More information about the Bf-blender-cvs mailing list