[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13067] trunk/blender/source/blender: Routine purge of compiler warnings
Joshua Leung
aligorith at gmail.com
Mon Dec 31 00:27:35 CET 2007
Revision: 13067
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13067
Author: aligorith
Date: 2007-12-31 00:27:35 +0100 (Mon, 31 Dec 2007)
Log Message:
-----------
Routine purge of compiler warnings
* Most were uninitialised vars
* Fixed whitespace in a few places
* The change I made in rendercore.c -> do_bake_shade() was for an uninitialised var, but I hope it does't cause any rendering errors...
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/include/BDR_editobject.h
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/editobject.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-30 23:09:33 UTC (rev 13066)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-30 23:27:35 UTC (rev 13067)
@@ -1467,7 +1467,7 @@
BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;
float *data, *data_a, *v1, *v2, min, inp, x1, x2, y1, y2, vec[3];
struct bevelsort *sortdata, *sd, *sd1;
- int a, b, len, nr, poly, resolu;
+ int a, b, nr, poly, resolu, len=0;
/* this function needs an object, because of tflag and upflag */
cu= ob->data;
Modified: trunk/blender/source/blender/include/BDR_editobject.h
===================================================================
--- trunk/blender/source/blender/include/BDR_editobject.h 2007-12-30 23:09:33 UTC (rev 13066)
+++ trunk/blender/source/blender/include/BDR_editobject.h 2007-12-30 23:27:35 UTC (rev 13067)
@@ -81,6 +81,7 @@
void make_duplilist_real(void);
void apply_objects_locrot(void);
void apply_objects_visual_tx(void);
+void apply_object(void);
/* old transform */
void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert);
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c 2007-12-30 23:09:33 UTC (rev 13066)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c 2007-12-30 23:27:35 UTC (rev 13067)
@@ -1976,15 +1976,15 @@
if(bs->actob) {
Isect isec, minisec;
float co[3], minco[3];
- int hit, sign, dir;
+ int hit, sign, dir=1;
/* intersect with ray going forward and backward*/
hit= 0;
memset(&minisec, 0, sizeof(minisec));
minco[0]= minco[1]= minco[2]= 0.0f;
-
+
VECCOPY(bs->dir, shi->vn);
-
+
for(sign=-1; sign<=1; sign+=2) {
memset(&isec, 0, sizeof(isec));
VECCOPY(isec.start, shi->co);
@@ -1992,7 +1992,7 @@
isec.faceorig= (RayFace*)vlr;
isec.oborig= RAY_OBJECT_SET(&R, obi);
isec.userdata= bs;
-
+
if(bake_intersect_tree(R.raytree, &isec, shi->vn, sign, co)) {
if(!hit || VecLenf(shi->co, co) < VecLenf(shi->co, minco)) {
minisec= isec;
@@ -2014,13 +2014,11 @@
obi= RAY_OBJECT_GET(&R, minisec.ob);
quad= (minisec.isect == 2);
VECCOPY(shi->co, minco);
-
+
u= -minisec.u;
v= -minisec.v;
bake_set_shade_input(obi, vlr, shi, quad, 1, x, y, u, v);
}
-
-
}
if(bs->type==RE_BAKE_NORMALS && R.r.bake_normal_space==R_BAKE_SPACE_TANGENT)
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2007-12-30 23:09:33 UTC (rev 13066)
+++ trunk/blender/source/blender/src/buttons_object.c 2007-12-30 23:27:35 UTC (rev 13067)
@@ -3752,7 +3752,6 @@
ParticleSettings *part;
short butx=0, buty=160, butw=150, buth=20;
static short vgnum=0;
- int event;
if (psys==NULL) return;
part=psys->part;
Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c 2007-12-30 23:09:33 UTC (rev 13066)
+++ trunk/blender/source/blender/src/editobject.c 2007-12-30 23:27:35 UTC (rev 13067)
@@ -3700,6 +3700,7 @@
{
Base *base, *basact;
Object *ob;
+ bArmature *arm;
Mesh *me;
Curve *cu;
Nurb *nu;
@@ -3714,21 +3715,23 @@
if TESTBASELIB(base) {
ob= base->object;
if(ob->type==OB_MESH) {
+ me= ob->data;
+
if(me->id.us>1) {
error("Can't apply to a multi user mesh, doing nothing.");
- return 0;
+ return;
}
if(me->key) {
error("Can't apply to a mesh with vertex keys, doing nothing.");
- return 0;
+ return;
}
}
- else if (ob->type==OB_ARMATURE){
- bArmature *arm;
+ else if (ob->type==OB_ARMATURE) {
arm= ob->data;
+
if(arm->id.us>1) {
error("Can't apply to a multi user armature, doing nothing.");
- return 0;
+ return;
}
}
else if ELEM(ob->type, OB_CURVE, OB_SURF) {
@@ -3736,11 +3739,11 @@
if(cu->id.us>1) {
error("Can't apply to a multi user curve, doing nothing.");
- return 0;
+ return;
}
if(cu->key) {
error("Can't apply to a curve with vertex keys, doing nothing.");
- return 0;
+ return;
}
}
}
@@ -3752,7 +3755,7 @@
for (base= FIRSTBASE; base; base= base->next) {
if TESTBASELIB(base) {
ob= base->object;
-
+
if(ob->type==OB_MESH) {
object_to_mat3(ob, mat);
me= ob->data;
@@ -3778,15 +3781,13 @@
change = 1;
}
- else if (ob->type==OB_ARMATURE){
- bArmature *arm;
-
+ else if (ob->type==OB_ARMATURE) {
object_to_mat3(ob, mat);
arm= ob->data;
/* see checks above */
+ apply_rot_armature(ob, mat);
- apply_rot_armature (ob, mat);
/* Reset the object's transforms */
ob->size[0]= ob->size[1]= ob->size[2]= 1.0;
ob->rot[0]= ob->rot[1]= ob->rot[2]= 0.0;
More information about the Bf-blender-cvs
mailing list