[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36547] trunk/blender/source/blender: comment some unused code.
Campbell Barton
ideasman42 at gmail.com
Sun May 8 12:29:41 CEST 2011
Revision: 36547
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36547
Author: campbellbarton
Date: 2011-05-08 10:29:40 +0000 (Sun, 08 May 2011)
Log Message:
-----------
comment some unused code.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/render/intern/source/rayshade.c
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -529,8 +529,9 @@
int isect_ray_plane_v3(float p1[3], float d[3], float v0[3], float v1[3], float v2[3], float *lambda, int clip)
{
float p[3], s[3], e1[3], e2[3], q[3];
- float a, f, u, v;
-
+ float a, f;
+ /* float u, v; */ /*UNUSED*/
+
sub_v3_v3v3(e1, v1, v0);
sub_v3_v3v3(e2, v2, v0);
@@ -543,11 +544,11 @@
sub_v3_v3v3(s, p1, v0);
- u = f * dot_v3v3(s, p);
+ /* u = f * dot_v3v3(s, p); */ /*UNUSED*/
cross_v3_v3v3(q, s, e1);
- v = f * dot_v3v3(d, q);
+ /* v = f * dot_v3v3(d, q); */ /*UNUSED*/
*lambda = f * dot_v3v3(e2, q);
if (clip && (*lambda < 0.0f)) return 0;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -5640,10 +5640,11 @@
xstart+= butw3+5;
/* rna property */
- if(kmi->ptr && kmi->ptr->data)
+ if(kmi->ptr && kmi->ptr->data) {
uiDefBut(block, LABEL, 0, "(RNA property)", xstart, (int)te->ys+1, butw2, OL_H-1, &kmi->oskey, 0, 0, 0, 0, ""); xstart+= butw2;
-
-
+ }
+
+ (void)xstart;
}
}
Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -1495,6 +1495,8 @@
glRecti(x-4, y, ar->winx, y-st->lheight), y-=st->lheight;
glRecti(x-4, y, x+toc*st->cwidth, y-st->lheight); y-=st->lheight;
+
+ (void)y;
}
}
else {
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -1426,14 +1426,13 @@
static int viewdolly_exec(bContext *C, wmOperator *op)
{
- View3D *v3d;
+ /* View3D *v3d; */
RegionView3D *rv3d;
ScrArea *sa;
ARegion *ar;
float mousevec[3];
int delta= RNA_int_get(op->ptr, "delta");
- int mx, my;
if(op->customdata) {
ViewOpsData *vod= op->customdata;
@@ -1448,7 +1447,7 @@
normalize_v3_v3(mousevec, ((RegionView3D *)ar->regiondata)->viewinv[2]);
}
- v3d= sa->spacedata.first;
+ /* v3d= sa->spacedata.first; */ /* UNUSED */
rv3d= ar->regiondata;
/* overwrite the mouse vector with the view direction (zoom into the center) */
@@ -1456,11 +1455,6 @@
normalize_v3_v3(mousevec, rv3d->viewinv[2]);
}
- mx= RNA_property_is_set(op->ptr, "mx") ? RNA_int_get(op->ptr, "mx") : ar->winx / 2;
- my= RNA_property_is_set(op->ptr, "my") ? RNA_int_get(op->ptr, "my") : ar->winy / 2;
-
-
-
if(delta < 0) {
view_dolly_mouseloc(ar, rv3d->ofs, mousevec, 1.2f);
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -4927,13 +4927,11 @@
}
else if ((t->flag & T_POSE) && (t->poseobj)) {
bArmature *arm;
- bPose *pose;
bPoseChannel *pchan;
short targetless_ik= 0;
ob= t->poseobj;
arm= ob->data;
- pose= ob->pose;
if((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) {
/* when running transform non-interactively (operator exec),
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -65,7 +65,7 @@
func= RNA_def_function(srna, "validate", "BKE_mesh_validate");
RNA_def_function_ui_description(func, "validate geometry, return True when the mesh has had invalid geometry corrected/removed.");
- parm= RNA_def_boolean(func, "verbose", 0, "Verbose", "Output information about the errors found");
+ RNA_def_boolean(func, "verbose", 0, "Verbose", "Output information about the errors found");
parm= RNA_def_boolean(func, "result", 0, "Result", "");
RNA_def_function_return(func, parm);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -339,8 +339,8 @@
RNA_def_function_flag(func, FUNC_USE_REPORTS);
prop= RNA_def_string(func, "filename", "", 0, "Filename", "Filename to load into this render tile, must be no smaller than the renderlayer");
RNA_def_property_flag(prop, PROP_REQUIRED);
- prop= RNA_def_int(func, "x", 0, 0, INT_MAX, "Offset X", "Offset the position to copy from if the image is larger than the render layer", 0, INT_MAX);
- prop= RNA_def_int(func, "y", 0, 0, INT_MAX, "Offset Y", "Offset the position to copy from if the image is larger than the render layer", 0, INT_MAX);
+ RNA_def_int(func, "x", 0, 0, INT_MAX, "Offset X", "Offset the position to copy from if the image is larger than the render layer", 0, INT_MAX);
+ RNA_def_int(func, "y", 0, 0, INT_MAX, "Offset Y", "Offset the position to copy from if the image is larger than the render layer", 0, INT_MAX);
RNA_define_verify_sdna(0);
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm_api.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -135,7 +135,7 @@
RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_property_range(parm, 0.0, FLT_MAX);
RNA_def_property_ui_text(parm, "Time Step", "Interval in seconds between timer events");
- parm= RNA_def_pointer(func, "window", "Window", "", "Window to attach the timer to or None.");
+ RNA_def_pointer(func, "window", "Window", "", "Window to attach the timer to or None.");
parm= RNA_def_pointer(func, "result", "Timer", "", "");
RNA_def_function_return(func, parm);
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c 2011-05-08 09:05:52 UTC (rev 36546)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c 2011-05-08 10:29:40 UTC (rev 36547)
@@ -1729,7 +1729,7 @@
/* end warning! - Campbell */
shade_ray(&isec, &shi, &shr_t);
- fac= isec.dist*isec.dist;
+ /* fac= isec.dist*isec.dist; */
fac= 1.0f;
accum[0]+= fac*(shr_t.diff[0]+shr_t.spec[0]);
accum[1]+= fac*(shr_t.diff[1]+shr_t.spec[1]);
More information about the Bf-blender-cvs
mailing list