[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40443] trunk/blender/source/blender: comment some unused vars / assignments.
Campbell Barton
ideasman42 at gmail.com
Thu Sep 22 05:14:55 CEST 2011
Revision: 40443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40443
Author: campbellbarton
Date: 2011-09-22 03:14:50 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
comment some unused vars / assignments.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -318,6 +318,8 @@
set_scene_bg(G.main, CTX_data_scene(C));
MEM_freeN(bfd);
+
+ (void)curscene; /* quiet warning */
}
static int handle_subversion_warning(Main *main, ReportList *reports)
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -1408,7 +1408,7 @@
}
/* Interior face verts */
- lvl = lvl1->next->next;
+ /* lvl = lvl1->next->next; */ /* UNUSED */
dst = 0;
for(j = 0; j < lvl1->totface; ++j) {
int sides = lvl1->faces[j].v[3] ? 4 : 3;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -2376,7 +2376,7 @@
BezTriple *bezt;
BPoint *bp;
int a;
- short lastsel= 0, sel=0;
+ short lastsel= 0;
if(next==0) return;
@@ -2388,13 +2388,12 @@
if(next < 0) bezt= (nu->bezt + (a-1));
while(a--) {
if(a-abs(next) < 0) break;
- sel= 0;
if((lastsel==0) && (bezt->hide==0) && ((bezt->f2 & SELECT) || (selstatus==0))) {
bezt+=next;
if(!(bezt->f2 & SELECT) || (selstatus==0)) {
- sel= select_beztriple(bezt, selstatus, 1, VISIBLE);
+ short sel= select_beztriple(bezt, selstatus, 1, VISIBLE);
if((sel==1) && (cont==0)) lastsel= 1;
- }
+ }
}
else {
bezt+=next;
@@ -2410,11 +2409,10 @@
if(next < 0) bp= (nu->bp + (a-1));
while(a--) {
if(a-abs(next) < 0) break;
- sel=0;
if((lastsel==0) && (bp->hide==0) && ((bp->f1 & SELECT) || (selstatus==0))) {
bp+=next;
if(!(bp->f1 & SELECT) || (selstatus==0)) {
- sel= select_bpoint(bp, selstatus, 1, VISIBLE);
+ short sel= select_bpoint(bp, selstatus, 1, VISIBLE);
if((sel==1) && (cont==0)) lastsel= 1;
}
}
@@ -2443,7 +2441,6 @@
BezTriple *bezt;
Curve *cu;
int a;
- short sel;
if(obedit==NULL) return;
@@ -2451,7 +2448,6 @@
cu->lastsel= NULL;
for(nu= editnurb->first; nu; nu= nu->next) {
- sel= 0;
if(nu->type == CU_BEZIER) {
a= nu->pntsu;
@@ -2464,6 +2460,7 @@
}
while(a--) {
+ short sel;
if(doswap) sel= swap_selection_beztriple(bezt);
else sel= select_beztriple(bezt, selstatus, 1, VISIBLE);
@@ -2483,6 +2480,7 @@
while(a--) {
if (bp->hide == 0) {
+ short sel;
if(doswap) sel= swap_selection_bpoint(bp);
else sel= select_bpoint(bp, selstatus, 1, VISIBLE);
Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -255,12 +255,12 @@
static boolean
handle_app1 (j_decompress_ptr cinfo)
{
- INT32 length, i;
+ INT32 length; /* initialized by the macro */
+ INT32 i;
char neogeo[128];
INPUT_VARS(cinfo);
-
- length = 0;
+
INPUT_2BYTES(cinfo, length, return FALSE);
length -= 2;
Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -84,7 +84,7 @@
{
PropertyRNA *prop;
- prop= RNA_def_string_translate(func, "text", "", 0, "", "Override automatic text of the item");
+ RNA_def_string_translate(func, "text", "", 0, "", "Override automatic text of the item");
prop= RNA_def_property(func, "icon", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, icon_items);
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -52,8 +52,6 @@
NodeChroma *c=(NodeChroma *)node->storage;
float alpha;
- alpha=0.0;
-
/* test range*/
if(in[0]>c->t1) {
alpha=1.0;
Modified: trunk/blender/source/blender/render/intern/source/pixelshading.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pixelshading.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/render/intern/source/pixelshading.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -226,8 +226,7 @@
}
/* shadow */
- if(i> -0.41f) { /* heuristic valua! */
- shadfac= 1.0;
+ if(i> -0.41f) { /* heuristic valua! */
if(lar->shb) {
shadfac = testshadowbuf(&R, lar->shb, rco, dco, dco, inp, 0.0f);
if(shadfac==0.0f) continue;
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c 2011-09-22 02:33:58 UTC (rev 40442)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c 2011-09-22 03:14:50 UTC (rev 40443)
@@ -726,7 +726,7 @@
/* in latter case, only last multiplication uses 'nl' */
static float OrenNayar_Diff(float nl, float *n, float *l, float *v, float rough )
{
- float i/*, nh*/, nv, vh, realnl, h[3];
+ float i/*, nh*/, nv /*, vh */, realnl, h[3];
float a, b, t, A, B;
float Lit_A, View_A, Lit_B[3], View_B[3];
@@ -745,8 +745,8 @@
if(realnl<=0.0f) return 0.0f;
if(nl<0.0f) return 0.0f; /* value from area light */
- vh= v[0]*h[0]+v[1]*h[1]+v[2]*h[2]; /* Dot product between view vector and halfway vector */
- if(vh<=0.0f) vh= 0.0f;
+ /* vh= v[0]*h[0]+v[1]*h[1]+v[2]*h[2]; */ /* Dot product between view vector and halfway vector */
+ /* if(vh<=0.0f) vh= 0.0f; */
Lit_A = saacos(realnl);
View_A = saacos( nv );
More information about the Bf-blender-cvs
mailing list