Revision: 40149
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40149
Author: campbellbarton
Date: 2011-09-12 04:57:20 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
svn merge -r40140:r40148
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40140
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40148
Modified Paths:
--------------
branches/bmesh/blender/intern/elbeem/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
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/editors/armature/editarmature_sketch.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_constraints.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_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_material.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/renderdatabase.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/gameengine/Converter/BL_SkinDeformer.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-40140
+ /trunk/blender:39992-40148
Modified: branches/bmesh/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/elbeem/CMakeLists.txt 2011-09-12 04:29:35 UTC
(rev 40148)
+++ branches/bmesh/blender/intern/elbeem/CMakeLists.txt 2011-09-12 04:57:20 UTC
(rev 40149)
@@ -89,13 +89,28 @@
intern/utilities.h
)
-add_definitions(-DNOGUI -DELBEEM_BLENDER=1)
+add_definitions(
+ -DNOGUI
+ -DELBEEM_BLENDER=1
+)
+
+# not essential but quiet gcc's -Wundef
+add_definitions(
+ -DLBM_PRECISION=1
+ -DLBM_INCLUDE_TESTSOLVERS=0
+ -DFSGR_STRICT_DEBUG=0
+ -DELBEEM_MPI=0
+ -DNEWDIRVELMOTEST=0
+)
+
if(WINDOWS)
add_definitions(-DUSE_MSVC6FIXES)
endif()
if(WITH_OPENMP)
add_definitions(-DPARALLEL=1)
+else()
+ add_definitions(-DPARALLEL=0)
endif()
blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}")
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40140
+ /trunk/blender/release:31524-40148
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -1839,13 +1839,13 @@
/* check if we've been here before (normal should not be 0) */
if(vec[3] || vec[4] || vec[5]) return;
- VECCOPY(vec, co);
+ copy_v3_v3(vec, co);
vec+= 3;
if(no_f) {
- VECCOPY(vec, no_f);
+ copy_v3_v3(vec, no_f);
}
else {
- VECCOPY(vec, no_s);
+ normal_short_to_float_v3(vec, no_s);
}
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -156,8 +156,8 @@
if(rule->type == eBoidRuleType_Goal && boids->options &
BOID_ALLOW_CLIMB && surface!=0.0f) {
if(!bbd->goal_ob || bbd->goal_priority < priority) {
bbd->goal_ob = eob;
- VECCOPY(bbd->goal_co, efd.loc);
- VECCOPY(bbd->goal_nor, efd.nor);
+ copy_v3_v3(bbd->goal_co, efd.loc);
+ copy_v3_v3(bbd->goal_nor, efd.nor);
}
}
else if(rule->type == eBoidRuleType_Avoid && bpa->data.mode ==
eBoidMode_Climbing &&
@@ -869,7 +869,7 @@
{
BoidParticle *bpa = pa->boid;
float nor[3], vel[3];
- VECCOPY(nor, surface_nor);
+ copy_v3_v3(nor, surface_nor);
/* gather apparent gravity */
VECADDFAC(bpa->gravity, bpa->gravity, surface_nor, -1.0f);
@@ -1345,7 +1345,7 @@
{
boid_climb(boids, pa, ground_co, ground_nor);
//float nor[3];
- //VECCOPY(nor, ground_nor);
+ //copy_v3_v3(nor, ground_nor);
///* gather apparent gravity to r_ve */
//VECADDFAC(pa->r_ve, pa->r_ve, ground_nor, -1.0);
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -2187,7 +2187,7 @@
cddm->mvert = vert;
for(i = 0; i < dm->numVertData; ++i, ++vert)
- VECCOPY(vert->no, vertNormals[i]);
+ copy_v3_v3_short(vert->no, vertNormals[i]);
}
void CDDM_calc_normals(DerivedMesh *dm)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -105,11 +105,11 @@
// fill tree
for ( i = 0; i < numfaces; i++, tface++ )
{
- VECCOPY ( &co[0*3], x[tface->v1].co );
- VECCOPY ( &co[1*3], x[tface->v2].co );
- VECCOPY ( &co[2*3], x[tface->v3].co );
+ copy_v3_v3 ( &co[0*3], x[tface->v1].co );
+ copy_v3_v3 ( &co[1*3], x[tface->v2].co );
+ copy_v3_v3 ( &co[2*3], x[tface->v3].co );
if ( tface->v4 )
- VECCOPY ( &co[3*3], x[tface->v4].co );
+ copy_v3_v3 ( &co[3*3], x[tface->v4].co );
BLI_bvhtree_insert ( tree, i, co, ( mfaces->v4 ? 4 : 3 ) );
}
@@ -134,21 +134,21 @@
{
for ( i = 0; i < numfaces; i++, mfaces++ )
{
- VECCOPY ( &co[0*3], x[mfaces->v1].co );
- VECCOPY ( &co[1*3], x[mfaces->v2].co );
- VECCOPY ( &co[2*3], x[mfaces->v3].co );
+ copy_v3_v3 ( &co[0*3], x[mfaces->v1].co );
+ copy_v3_v3 ( &co[1*3], x[mfaces->v2].co );
+ copy_v3_v3 ( &co[2*3], x[mfaces->v3].co );
if ( mfaces->v4 )
- VECCOPY ( &co[3*3], x[mfaces->v4].co );
+ copy_v3_v3 ( &co[3*3], x[mfaces->v4].co );
// copy new locations into array
if ( moving && xnew )
{
// update moving positions
- VECCOPY ( &co_moving[0*3], xnew[mfaces->v1].co
);
- VECCOPY ( &co_moving[1*3], xnew[mfaces->v2].co
);
- VECCOPY ( &co_moving[2*3], xnew[mfaces->v3].co
);
+ copy_v3_v3 ( &co_moving[0*3],
xnew[mfaces->v1].co );
+ copy_v3_v3 ( &co_moving[1*3],
xnew[mfaces->v2].co );
+ copy_v3_v3 ( &co_moving[2*3],
xnew[mfaces->v3].co );
if ( mfaces->v4 )
- VECCOPY ( &co_moving[3*3],
xnew[mfaces->v4].co );
+ copy_v3_v3 ( &co_moving[3*3],
xnew[mfaces->v4].co );
ret = BLI_bvhtree_update_node ( bvhtree, i, co,
co_moving, ( mfaces->v4 ? 4 : 3 ) );
}
@@ -551,7 +551,7 @@
float temp[3], spf;
// calculate tangential velocity
- VECCOPY ( temp, collpair->normal );
+ copy_v3_v3 ( temp, collpair->normal );
mul_v3_fl( temp, magrelVel );
VECSUB ( vrel_t_pre, relativeVelocity, temp );
@@ -2347,7 +2347,7 @@
if ( verts[i].impulse_count )
{
VECADDMUL ( verts[i].tv,
verts[i].impulse, 1.0f / verts[i].impulse_count );
- VECCOPY ( verts[i].impulse,
tnull );
+ copy_v3_v3 ( verts[i].impulse,
tnull );
verts[i].impulse_count = 0;
ret++;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -590,16 +590,16 @@
BLI_bvhtree_find_nearest(surmd->bvhtree->tree, co, &nearest,
surmd->bvhtree->nearest_callback, surmd->bvhtree);
if(nearest.index != -1) {
- VECCOPY(surface_co, nearest.co);
+ copy_v3_v3(surface_co, nearest.co);
if(surface_nor) {
- VECCOPY(surface_nor, nearest.no);
+ copy_v3_v3(surface_nor, nearest.no);
}
if(surface_vel) {
MFace *mface = CDDM_get_tessface(surmd->dm,
nearest.index);
- VECCOPY(surface_vel, surmd->v[mface->v1].co);
+ copy_v3_v3(surface_vel, surmd->v[mface->v1].co);
add_v3_v3(surface_vel, surmd->v[mface->v2].co);
add_v3_v3(surface_vel, surmd->v[mface->v3].co);
if(mface->v4)
@@ -705,7 +705,7 @@
sub_v3_v3v3(efd->loc, point->loc, translate);
}
else {
- VECCOPY(efd->loc, ob->obmat[3]);
+ copy_v3_v3(efd->loc, ob->obmat[3]);
}
if(real_velocity)
@@ -727,8 +727,8 @@
mul_v3_fl(efd->vec_to_point,
(efd->distance-eff->pd->f_size)/efd->distance);
if(eff->flag & PE_USE_NORMAL_DATA) {
- VECCOPY(efd->vec_to_point2, efd->vec_to_point);
- VECCOPY(efd->nor2, efd->nor);
+ copy_v3_v3(efd->vec_to_point2, efd->vec_to_point);
+ copy_v3_v3(efd->nor2, efd->nor);
}
else {
/* for some effectors we need the object center every
time */
@@ -800,7 +800,7 @@
strength= eff->pd->f_strength * efd->falloff;
- VECCOPY(tex_co,point->loc);
+ copy_v3_v3(tex_co,point->loc);
if(eff->pd->flag & PFIELD_TEX_2D) {
float fac=-dot_v3v3(tex_co, efd->nor);
@@ -878,11 +878,11 @@
damp += wind_func(rng, noise_factor);
}
- VECCOPY(force, efd->vec_to_point);
+ copy_v3_v3(force, efd->vec_to_point);
switch(pd->forcefield){
case PFIELD_WIND:
- VECCOPY(force, efd->nor);
+ copy_v3_v3(force, efd->nor);
mul_v3_fl(force, strength * efd->falloff);
break;
case PFIELD_FORCE:
@@ -944,7 +944,7 @@
return;
case PFIELD_TURBULENCE:
if(pd->flag & PFIELD_GLOBAL_CO) {
- VECCOPY(temp, point->loc);
+ copy_v3_v3(temp, point->loc);
}
else {
VECADD(temp, efd->vec_to_point2, efd->nor2);
@@ -955,7 +955,7 @@
mul_v3_fl(force, strength * efd->falloff);
break;
case PFIELD_DRAG:
- VECCOPY(force, point->vel);
+ copy_v3_v3(force, point->vel);
fac = normalize_v3(force) * point->vel_to_sec;
strength = MIN2(strength, 2.0f);
@@ -1039,7 +1039,7 @@
do_texture_effector(eff, &efd, point,
force);
else {
float temp1[3]={0,0,0}, temp2[3];
- VECCOPY(temp1, force);
+ copy_v3_v3(temp1, force);
do_physical_effector(eff, &efd, point,
force);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -2092,10 +2092,10 @@
data = eff->guide_data + p;
VECSUB(efd.vec_to_point, state.co, eff->guide_loc);
- VECCOPY(efd.nor, eff->guide_dir);
+ copy_v3_v3(efd.nor, eff->guide_dir);
efd.distance = len_v3(efd.vec_to_point);
- VECCOPY(data->vec_to_point, efd.vec_to_point);
+ copy_v3_v3(data->vec_to_point, efd.vec_to_point);
data->strength = effector_falloff(eff, &efd, &point,
weights);
}
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
2011-09-12 04:29:35 UTC (rev 40148)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
2011-09-12 04:57:20 UTC (rev 40149)
@@ -245,13 +245,13 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
