diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-04 12:28:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-04 12:28:37 +0400 |
commit | 019dca9c54289136b34c688a048ee009e2e852ee (patch) | |
tree | 3d1fda905f9b53310a0a948dfba7bd039b273f5a /source/blender/editors | |
parent | 91c38f0aa0e68e94f51861172862e233716c54d8 (diff) |
remove redundant code, also dont bother with os.path.basename(x) for recent scons commit.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 36711d14beb..1c53be15a0f 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -2690,9 +2690,7 @@ static void project_bucket_init(const ProjPaintState *ps, const int thread_index tf = ps->dm_mtface+face_index; if (tpage_last != tf->tpage) { tpage_last = tf->tpage; - - image_index = -1; /* sanity check */ - + for (image_index=0; image_index < ps->image_tot; image_index++) { if (ps->projImages[image_index].ima == tpage_last) { ibuf = ps->projImages[image_index].ibuf; @@ -4900,7 +4898,6 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event) time= PIL_check_seconds_timer(); tablet= 0; - pressure= 0; pop->s.blend= pop->s.brush->blend; if(event->custom == EVT_DATA_TABLET) { @@ -4911,8 +4908,9 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event) if(wmtab->Active == EVT_TABLET_ERASER) pop->s.blend= IMB_BLEND_ERASE_ALPHA; } - else /* otherwise airbrush becomes 1.0 pressure instantly */ + else { /* otherwise airbrush becomes 1.0 pressure instantly */ pressure= pop->prev_pressure ? pop->prev_pressure : 1.0f; + } if(pop->first) { pop->prevmouse[0]= event->mval[0]; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 35c3e909d84..b84998e6b83 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5103,8 +5103,6 @@ static void drawspiral(const float cent[3], float rad, float tmat[][4], int star } } else { - a= 0; - fac= (float)(CIRCLE_RESOL-1) * tot_inv; x= sinval[start] * fac; y= cosval[start] * fac; |