Revision: 32682
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32682
Author: campbellbarton
Date: 2010-10-24 13:14:18 +0200 (Sun, 24 Oct 2010)
Log Message:
-----------
reverse merge r32670, turns out this isnt valid C and breaks for MSVC (possibly
valid C99?, cant find good info on this)
svn merge . -r32670:32669
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2010-10-24
08:06:19 UTC (rev 32681)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2010-10-24
11:14:18 UTC (rev 32682)
@@ -1939,10 +1939,11 @@
/* make perpendicular, modify tan in place, is ok */
float cross_tmp[3];
+ float zero[3] = {0,0,0};
cross_v3_v3v3(cross_tmp, bevp1->tan, bevp1->dir);
normalize_v3(cross_tmp);
- tri_to_quat( bevp1->quat, (float [3]){0,0,0}, cross_tmp,
bevp1->tan); /* XXX - could be faster */
+ tri_to_quat( bevp1->quat,zero, cross_tmp, bevp1->tan); /* XXX -
could be faster */
bevp0= bevp1;
bevp1= bevp2;
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-10-24
08:06:19 UTC (rev 32681)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2010-10-24
11:14:18 UTC (rev 32682)
@@ -502,7 +502,8 @@
/* Initialize the destination */
for(i = 0; i < d->totdisp; ++i) {
- zero_v3(d->disps[i]);
+ float z[3] = {0,0,0};
+ copy_v3_v3(d->disps[i], z);
}
/* For now, some restrictions on the input */
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2010-10-24
08:06:19 UTC (rev 32681)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2010-10-24
11:14:18 UTC (rev 32682)
@@ -1007,7 +1007,8 @@
else if(eff->pd->forcefield == PFIELD_TEXTURE)
do_texture_effector(eff, &efd, point,
force);
else {
- float temp1[3]={force[0], force[1],
force[2]}, temp2[3];
+ float temp1[3]={0,0,0}, temp2[3];
+ VECCOPY(temp1, force);
do_physical_effector(eff, &efd, point,
force);
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2010-10-24 08:06:19 UTC (rev 32681)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2010-10-24 11:14:18 UTC (rev 32682)
@@ -6139,7 +6139,8 @@
/* patch for several 3d cards (IBM mostly) that
crash on glSelect with text drawing */
/* but, we also dont draw names for sets or
duplicators */
if(flag == 0) {
- view3d_cached_text_draw_add((float
[3]){0,0,0}, ob->id.name+2, 10, 0);
+ float zero[3]= {0,0,0};
+ view3d_cached_text_draw_add(zero,
ob->id.name+2, 10, 0);
}
}
/*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-10-24
08:06:19 UTC (rev 32681)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c 2010-10-24
11:14:18 UTC (rev 32682)
@@ -212,8 +212,9 @@
float totlen = len_v3(mtx_tx[3]);
if(totlen != 0.0f) {
+ float zero[3]={0.0f, 0.0f, 0.0f};
float cp[3];
- screw_ofs= closest_to_line_v3(cp, mtx_tx[3],
(float []){0,0,0}, axis_vec);
+ screw_ofs= closest_to_line_v3(cp, mtx_tx[3],
zero, axis_vec);
}
else {
screw_ofs= 0.0f;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
