[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41603] branches/bmesh/blender: svn merge -r41575:41602 ^/trunk/blender

Campbell Barton ideasman42 at gmail.com
Mon Nov 7 08:01:25 CET 2011


Revision: 41603
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41603
Author:   campbellbarton
Date:     2011-11-07 07:01:24 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
svn merge -r41575:41602 ^/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41575

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_effect.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
    branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
    branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
    branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
    branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/key.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lamp.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
    branches/bmesh/blender/source/blender/blenkernel/intern/library.c
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/node.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
    branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/speaker.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenkernel/intern/world.c
    branches/bmesh/blender/source/blender/blenlib/BLI_kdopbvh.h
    branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/bmesh/blender/source/blender/blenlib/intern/graph.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/collada/AnimationExporter.cpp
    branches/bmesh/blender/source/blender/collada/AnimationExporter.h
    branches/bmesh/blender/source/blender/editors/animation/anim_channels_defines.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
    branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
    branches/bmesh/blender/source/blender/editors/curve/editcurve.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
    branches/bmesh/blender/source/blender/editors/include/ED_particle.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
    branches/bmesh/blender/source/blender/editors/object/object_add.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/object/object_lattice.c
    branches/bmesh/blender/source/blender/editors/object/object_modifier.c
    branches/bmesh/blender/source/blender/editors/object/object_transform.c
    branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
    branches/bmesh/blender/source/blender/editors/physics/particle_object.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_utils.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/space_info/textview.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawvolume.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_fly.c
    branches/bmesh/blender/source/blender/editors/transform/transform.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
    branches/bmesh/blender/source/blender/editors/transform/transform_input.c
    branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
    branches/bmesh/blender/source/blender/editors/util/crazyspace.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
    branches/bmesh/blender/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/bmesh/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
    branches/bmesh/blender/source/blender/render/intern/include/rendercore.h
    branches/bmesh/blender/source/blender/render/intern/include/zbuf.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/render/intern/source/envmap.c
    branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
    branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
    branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
    branches/bmesh/blender/source/blender/render/intern/source/pointdensity.c
    branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
    branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
    branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
    branches/bmesh/blender/source/blender/render/intern/source/shadbuf.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
    branches/bmesh/blender/source/blender/render/intern/source/sss.c
    branches/bmesh/blender/source/blender/render/intern/source/strand.c
    branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
    branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
    branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-41575
   + /trunk/blender:39992-41602


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-41575
   + /trunk/blender/release:31524-41602

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_effect.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_effect.h	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_effect.h	2011-11-07 07:01:24 UTC (rev 41603)
@@ -129,7 +129,7 @@
 
 /* needed for boids */
 float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights);
-int closest_point_on_surface(struct SurfaceModifierData *surmd, float *co, float *surface_co, float *surface_nor, float *surface_vel);
+int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]);
 int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity);
 
 /* required for particle_system.c */

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_library.h	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_library.h	2011-11-07 07:01:24 UTC (rev 41603)
@@ -46,7 +46,7 @@
 struct PropertyRNA;
 
 void *alloc_libblock(struct ListBase *lb, short type, const char *name);
-void *copy_libblock(void *rt);
+void *copy_libblock(struct ID *id);
 void copy_libblock_data(struct ID *id, const struct ID *id_from, const short do_action);
 
 void BKE_id_lib_local_paths(struct Main *bmain, struct ID *id);

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_object.h	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_object.h	2011-11-07 07:01:24 UTC (rev 41603)
@@ -106,7 +106,7 @@
 void object_get_dimensions(struct Object *ob, float *value);
 void object_set_dimensions(struct Object *ob, const float *value);
 void object_boundbox_flag(struct Object *ob, int flag, int set);
-void minmax_object(struct Object *ob, float *min, float *max);
+void minmax_object(struct Object *ob, float min[3], float max[3]);
 int minmax_object_duplis(struct Scene *scene, struct Object *ob, float *min, float *max);
 void solve_tracking (struct Object *ob, float targetmat[][4]);
 int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3]);

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h	2011-11-07 07:01:24 UTC (rev 41603)
@@ -254,8 +254,8 @@
 int psys_render_simplify_distribution(struct ParticleThreadContext *ctx, int tot);
 int psys_render_simplify_params(struct ParticleSystem *psys, struct ChildParticle *cpa, float *params);
 
-void psys_interpolate_uvs(struct MTFace *tface, int quad, float *uv, float *uvco);
-void psys_interpolate_mcol(struct MCol *mcol, int quad, float *uv, struct MCol *mc);
+void psys_interpolate_uvs(const struct MTFace *tface, int quad, const float w[4], float uvco[2]);
+void psys_interpolate_mcol(const struct MCol *mcol, int quad, const float w[4], struct MCol *mc);
 
 void copy_particle_key(struct ParticleKey *to, struct ParticleKey *from, int time);
 
@@ -335,12 +335,12 @@
 
 /* BLI_bvhtree_ray_cast callback */
 void BKE_psys_collision_neartest_cb(void *userdata, int index, const struct BVHTreeRay *ray, struct BVHTreeRayHit *hit);
-void psys_particle_on_dm(struct DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor);
+void psys_particle_on_dm(struct DerivedMesh *dm, int from, int index, int index_dmcache, const float fw[4], float foffset, float vec[3], float nor[3], float utan[3], float vtan[3], float orco[3], float ornor[3]);
 
 /* particle_system.c */
 void initialize_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, int p);
 void psys_calc_dmcache(struct Object *ob, struct DerivedMesh *dm, struct ParticleSystem *psys);
-int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, float *fw, struct LinkNode *node);
+int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, const float fw[4], struct LinkNode *node);
 
 void reset_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, float dtime, float cfra);
 

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h	2011-11-07 07:01:24 UTC (rev 41603)
@@ -86,7 +86,7 @@
 int scene_check_setscene(struct Main *bmain, struct Scene *sce);
 
 float BKE_curframe(struct Scene *scene);
-float BKE_nextframe(struct Scene *scene);
+float BKE_frame_to_ctime(struct Scene *scene, const float frame);
 
 void scene_update_tagged(struct Main *bmain, struct Scene *sce);
 void scene_clear_tagged(struct Main *bmain, struct Scene *sce);

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-11-07 07:01:24 UTC (rev 41603)
@@ -461,7 +461,7 @@
 	mvert=dm->getVertDataArray(dm, CD_MVERT);
 	
 	for(a=0; a<kb->totelem; a++, fp+=3, mvert++) {
-		VECCOPY(fp, mvert->co);
+		copy_v3_v3(fp, mvert->co);
 	}
 }
 
@@ -737,8 +737,9 @@
 	orco = MEM_mallocN(sizeof(float)*3*totvert, "EditMesh Orco");
 
 	eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
-	for (a=0; eve; eve=BMIter_Step(&iter), a+=3)
-		VECCOPY(orco+a, eve->co);
+	for (a=0; eve; eve=BMIter_Step(&iter), a+=3) {
+		copy_v3_v3(orco+a, eve->co);
+	}
 	
 	return orco;
 }
@@ -1475,7 +1476,7 @@
 
 	eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
 	for (i=0; eve; eve=BMIter_Step(&iter), i++) {
-		VECCOPY(cos[i], eve->co);
+		copy_v3_v3(cos[i], eve->co);
 	}
 
 	return cos;
@@ -1984,7 +1985,7 @@
 	//assert(vert_index>=0 && vert_index<4);
 	SGLSLMeshToTangent * pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
 	const float *co= pMesh->mvert[(&pMesh->mface[face_num].v1)[vert_index]].co;
-	VECCOPY(fPos, co);
+	copy_v3_v3(fPos, co);
 }
 
 static void GetTextureCoordinate(const SMikkTSpaceContext * pContext, float fUV[], const int face_num, const int vert_index)
@@ -2010,7 +2011,7 @@
 	const int smoothnormal = (pMesh->mface[face_num].flag & ME_SMOOTH);
 	if(!smoothnormal) {	// flat
 		if(pMesh->precomputedFaceNormals) {
-			VECCOPY(fNorm, &pMesh->precomputedFaceNormals[3*face_num]);
+			copy_v3_v3(fNorm, &pMesh->precomputedFaceNormals[3*face_num]);
 		}
 		else {
 			MFace *mf= &pMesh->mface[face_num];
@@ -2037,7 +2038,7 @@
 	//assert(vert_index>=0 && vert_index<4);
 	SGLSLMeshToTangent * pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
 	float * pRes = pMesh->tangent[4*face_num+iVert];
-	VECCOPY(pRes, fvTangent);
+	copy_v3_v3(pRes, fvTangent);
 	pRes[3]=fSign;
 }
 

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/action.c	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/action.c	2011-11-07 07:01:24 UTC (rev 41603)
@@ -185,7 +185,7 @@
 	
 	if (src == NULL) 
 		return NULL;
-	dst= copy_libblock(src);
+	dst= copy_libblock(&src->id);
 	
 	/* duplicate the lists of groups and markers */
 	BLI_duplicatelist(&dst->groups, &src->groups);

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c	2011-11-07 07:01:24 UTC (rev 41603)
@@ -204,7 +204,7 @@
 	Bone		*oldBone, *newBone;
 	Bone		*newActBone= NULL;
 	
-	newArm= copy_libblock (arm);
+	newArm= copy_libblock(&arm->id);
 	BLI_duplicatelist(&newArm->bonebase, &arm->bonebase);
 	
 	/*	Duplicate the childrens' lists*/

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/boids.c	2011-11-07 05:28:26 UTC (rev 41602)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/boids.c	2011-11-07 07:01:24 UTC (rev 41603)
@@ -162,7 +162,7 @@
 			negate_v3_v3(efd.vec_to_point, bpa->gravity);
 		}
 
-		VECCOPY(bbd->wanted_co, efd.vec_to_point);
+		copy_v3_v3(bbd->wanted_co, efd.vec_to_point);
 		mul_v3_fl(bbd->wanted_co, mul);
 
 		bbd->wanted_speed = val->max_speed * priority;
@@ -204,7 +204,7 @@
 		BVHTreeRayHit hit;
 		float radius = val->personal_space * pa->size, ray_dir[3];
 
-		VECCOPY(col.co1, pa->prev_state.co);
+		copy_v3_v3(col.co1, pa->prev_state.co);
 		add_v3_v3v3(col.co2, pa->prev_state.co, pa->prev_state.vel);
 		sub_v3_v3v3(ray_dir, col.co2, col.co1);
 		mul_v3_fl(ray_dir, acbr->look_ahead);
@@ -254,10 +254,10 @@
 	{
 		neighbors = BLI_kdtree_range_search(bbd->sim->psys->tree, acbr->look_ahead * len_v3(pa->prev_state.vel), pa->prev_state.co, pa->prev_state.ave, &ptn);
 		if(neighbors > 1) for(n=1; n<neighbors; n++) {
-			VECCOPY(co1, pa->prev_state.co);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list