comment some unused code.

This commit is contained in:
2011-05-08 10:29:40 +00:00
parent ed3fd72210
commit d4e540dff3
9 changed files with 18 additions and 22 deletions

View File

@@ -529,8 +529,9 @@ int isect_ray_tri_v3(const float p1[3], const float d[3], const float v0[3], con
int isect_ray_plane_v3(float p1[3], float d[3], float v0[3], float v1[3], float v2[3], float *lambda, int clip) 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 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(e1, v1, v0);
sub_v3_v3v3(e2, v2, v0); sub_v3_v3v3(e2, v2, v0);
@@ -543,11 +544,11 @@ int isect_ray_plane_v3(float p1[3], float d[3], float v0[3], float v1[3], float
sub_v3_v3v3(s, p1, v0); 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); 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); *lambda = f * dot_v3v3(e2, q);
if (clip && (*lambda < 0.0f)) return 0; if (clip && (*lambda < 0.0f)) return 0;

View File

@@ -5640,10 +5640,11 @@ static void outliner_draw_keymapbuts(uiBlock *block, ARegion *ar, SpaceOops *soo
xstart+= butw3+5; xstart+= butw3+5;
/* rna property */ /* 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; 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;
} }
} }

View File

@@ -1495,6 +1495,8 @@ static void draw_cursor(SpaceText *st, ARegion *ar)
glRecti(x-4, y, ar->winx, y-st->lheight), y-=st->lheight; 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; glRecti(x-4, y, x+toc*st->cwidth, y-st->lheight); y-=st->lheight;
(void)y;
} }
} }
else { else {

View File

@@ -1426,14 +1426,13 @@ static int viewdolly_modal(bContext *C, wmOperator *op, wmEvent *event)
static int viewdolly_exec(bContext *C, wmOperator *op) static int viewdolly_exec(bContext *C, wmOperator *op)
{ {
View3D *v3d; /* View3D *v3d; */
RegionView3D *rv3d; RegionView3D *rv3d;
ScrArea *sa; ScrArea *sa;
ARegion *ar; ARegion *ar;
float mousevec[3]; float mousevec[3];
int delta= RNA_int_get(op->ptr, "delta"); int delta= RNA_int_get(op->ptr, "delta");
int mx, my;
if(op->customdata) { if(op->customdata) {
ViewOpsData *vod= op->customdata; ViewOpsData *vod= op->customdata;
@@ -1448,7 +1447,7 @@ static int viewdolly_exec(bContext *C, wmOperator *op)
normalize_v3_v3(mousevec, ((RegionView3D *)ar->regiondata)->viewinv[2]); normalize_v3_v3(mousevec, ((RegionView3D *)ar->regiondata)->viewinv[2]);
} }
v3d= sa->spacedata.first; /* v3d= sa->spacedata.first; */ /* UNUSED */
rv3d= ar->regiondata; rv3d= ar->regiondata;
/* overwrite the mouse vector with the view direction (zoom into the center) */ /* overwrite the mouse vector with the view direction (zoom into the center) */
@@ -1456,11 +1455,6 @@ static int viewdolly_exec(bContext *C, wmOperator *op)
normalize_v3_v3(mousevec, rv3d->viewinv[2]); 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) { if(delta < 0) {
view_dolly_mouseloc(ar, rv3d->ofs, mousevec, 1.2f); view_dolly_mouseloc(ar, rv3d->ofs, mousevec, 1.2f);
} }

View File

@@ -4927,13 +4927,11 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
} }
else if ((t->flag & T_POSE) && (t->poseobj)) { else if ((t->flag & T_POSE) && (t->poseobj)) {
bArmature *arm; bArmature *arm;
bPose *pose;
bPoseChannel *pchan; bPoseChannel *pchan;
short targetless_ik= 0; short targetless_ik= 0;
ob= t->poseobj; ob= t->poseobj;
arm= ob->data; arm= ob->data;
pose= ob->pose;
if((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) { if((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) {
/* when running transform non-interactively (operator exec), /* when running transform non-interactively (operator exec),

View File

@@ -65,7 +65,7 @@ void RNA_api_mesh(StructRNA *srna)
func= RNA_def_function(srna, "validate", "BKE_mesh_validate"); 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."); 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", ""); parm= RNA_def_boolean(func, "result", 0, "Result", "");
RNA_def_function_return(func, parm); RNA_def_function_return(func, parm);
} }

View File

@@ -339,8 +339,8 @@ static void rna_def_render_layer(BlenderRNA *brna)
RNA_def_function_flag(func, FUNC_USE_REPORTS); 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"); 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); 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); 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, "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); RNA_define_verify_sdna(0);

View File

@@ -135,7 +135,7 @@ void RNA_api_wm(StructRNA *srna)
RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_property_range(parm, 0.0, FLT_MAX); RNA_def_property_range(parm, 0.0, FLT_MAX);
RNA_def_property_ui_text(parm, "Time Step", "Interval in seconds between timer events"); 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", "", ""); parm= RNA_def_pointer(func, "result", "Timer", "", "");
RNA_def_function_return(func, parm); RNA_def_function_return(func, parm);

View File

@@ -1729,7 +1729,7 @@ int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr)
/* end warning! - Campbell */ /* end warning! - Campbell */
shade_ray(&isec, &shi, &shr_t); shade_ray(&isec, &shi, &shr_t);
fac= isec.dist*isec.dist; /* fac= isec.dist*isec.dist; */
fac= 1.0f; fac= 1.0f;
accum[0]+= fac*(shr_t.diff[0]+shr_t.spec[0]); accum[0]+= fac*(shr_t.diff[0]+shr_t.spec[0]);
accum[1]+= fac*(shr_t.diff[1]+shr_t.spec[1]); accum[1]+= fac*(shr_t.diff[1]+shr_t.spec[1]);