diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-04-15 05:19:13 +0400 |
| commit | c98148a963d37fc2f25e125afeb4cf21df6fbf14 (patch) | |
| tree | 691a051e27f08e35bf09d35b6fb9c88e4c37b8d2 /source/blender/editors/physics/particle_object.c | |
| parent | 0bba684d08952d0be822f3906ffb2a03b2674cc2 (diff) | |
| parent | fa63c297753636c149fbb1a3877d9b3d93601357 (diff) | |
=bmesh= merge from trunk at r36153
Diffstat (limited to 'source/blender/editors/physics/particle_object.c')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 7f830478f2a..d0deec70b51 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/editors/physics/particle_object.c + * \ingroup edphys + */ + + #include <stdlib.h> #include <string.h> @@ -624,7 +629,7 @@ static void connect_hair(Scene *scene, Object *ob, ParticleSystem *psys) PTCacheEditPoint *point; PTCacheEditKey *ekey = NULL; HairKey *key; - BVHTreeFromMesh bvhtree= {0}; + BVHTreeFromMesh bvhtree= {NULL}; BVHTreeNearest nearest; MFace *mface; DerivedMesh *dm = NULL; |