[Bf-blender-cvs] [2d1d909] strand_editmode: MSVC compiler cannot handle standard C code.
Lukas Tönne
noreply at git.blender.org
Mon Apr 20 14:24:00 CEST 2015
Commit: 2d1d90981715e604572f554ddbf49538afce7d90
Author: Lukas Tönne
Date: Fri Dec 5 16:37:25 2014 +0100
Branches: strand_editmode
https://developer.blender.org/rB2d1d90981715e604572f554ddbf49538afce7d90
MSVC compiler cannot handle standard C code.
Conflicts:
source/blender/editors/physics/particle_edit.c
===================================================================
M source/blender/editors/physics/particle_edit.c
===================================================================
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index a0420df..e714dfc 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4094,6 +4094,8 @@ static bool shape_cut_test_point(PEData *data, ParticleCacheKey *key)
userdata.bvhdata = data->shape_bvh;
userdata.num_hits = 0;
+ userdata.bvhdata = data->shape_bvh;
+ userdata.num_hits = 0;
BLI_bvhtree_ray_cast_all(shape_bvh->tree, key->co, dir, 0.0f, point_inside_bvh_cb, &userdata);
/* for any point inside a watertight mesh the number of hits is uneven */
More information about the Bf-blender-cvs
mailing list