Revision: 49105
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49105
Author: campbellbarton
Date: 2012-07-21 15:40:47 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49082:49104
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49082
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenlib/intern/lasso.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/renderdatabase.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49082
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49104
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -1438,9 +1438,9 @@
if (strip->flag &
ACTSTRIP_CYCLIC_USEZ) pose->cyclic_offset[2] = time * min[2];
}
else {
- if (fabs(min[0]) >=
fabs(min[1]) && fabs(min[0]) >= fabs(min[2]))
+ if (fabsf(min[0]) >=
fabsf(min[1]) && fabsf(min[0]) >= fabsf(min[2]))
pose->cyclic_offset[0]
= time * min[0];
- else if (fabs(min[1]) >=
fabs(min[0]) && fabs(min[1]) >= fabs(min[2]))
+ else if (fabsf(min[1]) >=
fabsf(min[0]) && fabsf(min[1]) >= fabsf(min[2]))
pose->cyclic_offset[1]
= time * min[1];
else
pose->cyclic_offset[2]
= time * min[2];
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -1712,7 +1712,7 @@
y2 /= t02;
t02 = x1 * x2 + y1 * y2;
- if (fabs(t02) >= 1.0)
+ if (fabsf(t02) >= 1.0f)
t02 = 0.5 * M_PI;
else
t02 = (saacos(t02)) / 2.0f;
@@ -2366,9 +2366,9 @@
bevp0 = bevp1 + (nr - 1);
nr--;
while (nr--) {
- if (fabs(bevp0->vec[0] - bevp1->vec[0]) <
0.00001) {
- if (fabs(bevp0->vec[1] - bevp1->vec[1])
< 0.00001) {
- if (fabs(bevp0->vec[2] -
bevp1->vec[2]) < 0.00001) {
+ if (fabsf(bevp0->vec[0] - bevp1->vec[0]) <
0.00001f) {
+ if (fabsf(bevp0->vec[1] -
bevp1->vec[1]) < 0.00001f) {
+ if (fabsf(bevp0->vec[2] -
bevp1->vec[2]) < 0.00001f) {
bevp0->dupe_tag = TRUE;
bl->dupe_nr++;
}
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/lasso.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/lasso.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/lasso.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -95,7 +95,7 @@
p2 = mcords[a + 1];
}
- if (fabs(angletot) > 4.0) return 1;
+ if (fabsf(angletot) > 4.0f) return 1;
return 0;
}
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -583,17 +583,17 @@
* compute slopes, note the cludge for infinity, however, this will
* be close enough
*/
- if (fabs(x1 - x0) > 0.000001f)
+ if (fabsf(x1 - x0) > 0.000001f)
m1 = (y1 - y0) / (x1 - x0);
else
return -1; /*m1 = (float)1e+10;*/ /* close enough to infinity */
- if (fabs(x3 - x2) > 0.000001f)
+ if (fabsf(x3 - x2) > 0.000001f)
m2 = (y3 - y2) / (x3 - x2);
else
return -1; /*m2 = (float)1e+10;*/ /* close enough to infinity */
- if (fabs(m1 - m2) < 0.000001f)
+ if (fabsf(m1 - m2) < 0.000001f)
return -1; /* parallel lines */
/* compute constants */
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -453,7 +453,7 @@
nor[1] = -z2;
nor[2] = y2;
- if (fabs(y2) + fabs(z2) < 0.0001)
+ if (fabsf(y2) + fabsf(z2) < 0.0001f)
nor[1] = 1.0;
co = x2;
@@ -463,7 +463,7 @@
nor[1] = 0.0;
nor[2] = -x2;
- if (fabs(x2) + fabs(z2) < 0.0001)
+ if (fabsf(x2) + fabsf(z2) < 0.0001f)
nor[2] = 1.0;
co = y2;
@@ -473,7 +473,7 @@
nor[1] = x2;
nor[2] = 0.0;
- if (fabs(x2) + fabs(y2) < 0.0001)
+ if (fabsf(x2) + fabsf(y2) < 0.0001f)
nor[0] = 1.0;
co = z2;
@@ -696,7 +696,7 @@
*angle = ha * 2;
/* prevent division by zero for axis conversion */
- if (fabs(si) < 0.0005)
+ if (fabsf(si) < 0.0005f)
si = 1.0f;
axis[0] = q[1] / si;
@@ -998,7 +998,7 @@
mat3_to_eul2(tmat, eul1, eul2);
/* return best, which is just the one with lowest values it in */
- if (fabs(eul1[0]) + fabs(eul1[1]) + fabs(eul1[2]) > fabs(eul2[0]) +
fabs(eul2[1]) + fabs(eul2[2])) {
+ if (fabsf(eul1[0]) + fabsf(eul1[1]) + fabsf(eul1[2]) > fabsf(eul2[0]) +
fabsf(eul2[1]) + fabsf(eul2[2])) {
copy_v3_v3(eul, eul2);
}
else {
@@ -1083,32 +1083,32 @@
dy = eul[1] - oldrot[1];
dz = eul[2] - oldrot[2];
- while (fabs(dx) > 5.1) {
+ while (fabsf(dx) > 5.1f) {
if (dx > 0.0f) eul[0] -= 2.0f * (float)M_PI;
else eul[0] += 2.0f * (float)M_PI;
dx = eul[0] - oldrot[0];
}
- while (fabs(dy) > 5.1) {
+ while (fabsf(dy) > 5.1f) {
if (dy > 0.0f) eul[1] -= 2.0f * (float)M_PI;
else eul[1] += 2.0f * (float)M_PI;
dy = eul[1] - oldrot[1];
}
- while (fabs(dz) > 5.1) {
+ while (fabsf(dz) > 5.1f) {
if (dz > 0.0f) eul[2] -= 2.0f * (float)M_PI;
else eul[2] += 2.0f * (float)M_PI;
dz = eul[2] - oldrot[2];
}
/* is 1 of the axis rotations larger than 180 degrees and the other
small? NO ELSE IF!! */
- if (fabs(dx) > 3.2 && fabs(dy) < 1.6 && fabs(dz) < 1.6) {
+ if (fabsf(dx) > 3.2f && fabsf(dy) < 1.6f && fabsf(dz) < 1.6f) {
if (dx > 0.0f) eul[0] -= 2.0f * (float)M_PI;
else eul[0] += 2.0f * (float)M_PI;
}
- if (fabs(dy) > 3.2 && fabs(dz) < 1.6 && fabs(dx) < 1.6) {
+ if (fabsf(dy) > 3.2f && fabsf(dz) < 1.6f && fabsf(dx) < 1.6f) {
if (dy > 0.0f) eul[1] -= 2.0f * (float)M_PI;
else eul[1] += 2.0f * (float)M_PI;
}
- if (fabs(dz) > 3.2 && fabs(dx) < 1.6 && fabs(dy) < 1.6) {
+ if (fabsf(dz) > 3.2f && fabsf(dx) < 1.6f && fabsf(dy) < 1.6f) {
if (dz > 0.0f) eul[2] -= 2.0f * (float)M_PI;
else eul[2] += 2.0f * (float)M_PI;
}
@@ -1123,29 +1123,29 @@
/* special case, tested for x-z */
- if ((fabs(dx) > 3.1 && fabs(dz) > 1.5) || (fabs(dx) > 1.5 && fabs(dz) >
3.1)) {
- if (dx > 0.0) eul[0] -= M_PI;
+ if ((fabsf(dx) > 3.1f && fabsf(dz) > 1.5f) || (fabsf(dx) > 1.5f &&
fabsf(dz) > 3.1f)) {
+ if (dx > 0.0f) eul[0] -= M_PI;
else eul[0] += M_PI;
if (eul[1] > 0.0) eul[1] = M_PI - eul[1];
else eul[1] = -M_PI - eul[1];
- if (dz > 0.0) eul[2] -= M_PI;
+ if (dz > 0.0f) eul[2] -= M_PI;
else eul[2] += M_PI;
}
- else if ((fabs(dx) > 3.1 && fabs(dy) > 1.5) || (fabs(dx) > 1.5 &&
fabs(dy) > 3.1)) {
- if (dx > 0.0) eul[0] -= M_PI;
+ else if ((fabsf(dx) > 3.1f && fabsf(dy) > 1.5f) || (fabsf(dx) > 1.5f &&
fabsf(dy) > 3.1f)) {
+ if (dx > 0.0f) eul[0] -= M_PI;
else eul[0] += M_PI;
- if (dy > 0.0) eul[1] -= M_PI;
+ if (dy > 0.0f) eul[1] -= M_PI;
else eul[1] += M_PI;
- if (eul[2] > 0.0) eul[2] = M_PI - eul[2];
+ if (eul[2] > 0.0f) eul[2] = M_PI - eul[2];
else eul[2] = -M_PI - eul[2];
}
- else if ((fabs(dy) > 3.1 && fabs(dz) > 1.5) || (fabs(dy) > 1.5 &&
fabs(dz) > 3.1)) {
- if (eul[0] > 0.0) eul[0] = M_PI - eul[0];
+ else if ((fabsf(dy) > 3.1f && fabsf(dz) > 1.5f) || (fabsf(dy) > 1.5f &&
fabsf(dz) > 3.f1)) {
+ if (eul[0] > 0.0f) eul[0] = M_PI - eul[0];
else eul[0] = -M_PI - eul[0];
- if (dy > 0.0) eul[1] -= M_PI;
+ if (dy > 0.0f) eul[1] -= M_PI;
else eul[1] += M_PI;
- if (dz > 0.0) eul[2] -= M_PI;
+ if (dz > 0.0f) eul[2] -= M_PI;
else eul[2] += M_PI;
}
#endif
@@ -1164,8 +1164,8 @@
compatible_eul(eul1, oldrot);
compatible_eul(eul2, oldrot);
- d1 = (float)fabs(eul1[0] - oldrot[0]) + (float)fabs(eul1[1] -
oldrot[1]) + (float)fabs(eul1[2] - oldrot[2]);
- d2 = (float)fabs(eul2[0] - oldrot[0]) + (float)fabs(eul2[1] -
oldrot[1]) + (float)fabs(eul2[2] - oldrot[2]);
+ d1 = (float)fabsf(eul1[0] - oldrot[0]) + (float)fabsf(eul1[1] -
oldrot[1]) + (float)fabsf(eul1[2] - oldrot[2]);
+ d2 = (float)fabsf(eul2[0] - oldrot[0]) + (float)fabsf(eul2[1] -
oldrot[1]) + (float)fabsf(eul2[2] - oldrot[2]);
/* return best, which is just the one with lowest difference */
if (d1 > d2) {
@@ -1360,7 +1360,7 @@
mat3_to_eulo2(M, eul1, eul2, order);
/* return best, which is just the one with lowest values it in */
- if (fabs(eul1[0]) + fabs(eul1[1]) + fabs(eul1[2]) > fabs(eul2[0]) +
fabs(eul2[1]) + fabs(eul2[2])) {
+ if (fabsf(eul1[0]) + fabsf(eul1[1]) + fabsf(eul1[2]) > fabsf(eul2[0]) +
fabsf(eul2[1]) + fabsf(eul2[2])) {
copy_v3_v3(eul, eul2);
}
else {
Modified: branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h 2012-07-21
15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h 2012-07-21
15:40:47 UTC (rev 49105)
@@ -198,8 +198,6 @@
ListBase errorstack;
void *py_handle;
-
- int opflag; /* current operator flag */
} BMesh;
/* BMHeader->htype (char) */
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
2012-07-21 15:27:40 UTC (rev 49104)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
2012-07-21 15:40:47 UTC (rev 49105)
@@ -290,47 +290,6 @@
MEM_freeN(edgevec);
}
-/*
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
