diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-28 19:37:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-28 19:37:18 +0400 |
commit | 608dc78241c98341c8fb4cab12d73f148adf0471 (patch) | |
tree | 6b8897d8a1859565e6ed5e19ad40916c29ecddc9 | |
parent | 428debd9c8af81ed5870c70466d46a60646f49e3 (diff) |
warning cleanup: assignment to unused vars, r56359 changes how brush falloff is used slightly but this isn't so important so just remove falloff adjustment.
5 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 445dfc6efd3..7b3f18c1bd4 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -974,10 +974,10 @@ static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned } } -static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *rect1, float *rect2, float *out) +static void do_sub_effect_float(float UNUSED(facf0), float facf1, int x, int y, float *rect1, float *rect2, float *out) { int xo; - float m, fac1, fac3; + float m /*, fac1*/, fac3; float *rt1, *rt2, *rt; xo = x; @@ -985,7 +985,8 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r rt2 = rect2; rt = out; - fac1 = facf0; + /* UNUSED */ + // fac1 = facf0; fac3 = facf1; while (y--) { diff --git a/source/blender/blenlib/intern/math_color_blend_inline.c b/source/blender/blenlib/intern/math_color_blend_inline.c index ccc9f355d57..94a474da681 100644 --- a/source/blender/blenlib/intern/math_color_blend_inline.c +++ b/source/blender/blenlib/intern/math_color_blend_inline.c @@ -352,7 +352,7 @@ MINLINE void blend_color_darken_float(float dst[4], const float src1[4], const f * src1 and src2, then blend it with src1 */ const float t = src2[3]; const float mt = 1.0f - t; - const float map_alpha = src1[3]/src2[3]; + const float map_alpha = src1[3] / src2[3]; dst[0] = mt * src1[0] + t * min_ff(src1[0], src2[0] * map_alpha); dst[1] = mt * src1[1] + t * min_ff(src1[1], src2[1] * map_alpha); diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 2e88c243df6..23a3288209d 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -610,7 +610,8 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r /* start a new preview render job if signalled through sbuts->preview, * or if no render result was found and no preview render job is running */ if ((sbuts->spacetype == SPACE_BUTS && sbuts->preview) || - (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW))) { + (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW))) + { sbuts->preview = 0; ED_preview_shader_job(C, sa, id, parent, slot, newx, newy, PR_BUTS_RENDER); } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 8efb765058d..b4507ecb6cc 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3822,7 +3822,7 @@ static void *do_projectpaint_thread(void *ph_v) float mask = ((float)projPixel->mask) * (1.0f / 65535.0f); straight_uchar_to_premul_float(newColor_f, projPixel->newColor.ch); - mul_v4_v4fl(newColor_f, newColor_f, mask); + mul_v4_v4fl(newColor_f, newColor_f, mask); blend_color_mix_float(projPixel->pixel.f_pt, projPixel->origColor.f, newColor_f); @@ -3893,10 +3893,6 @@ static void *do_projectpaint_thread(void *ph_v) mask *= ((float)projPixel->mask) * (1.0f / 65535.0f); } else { - /* This brush dosnt accumulate so add some curve to the brushes falloff */ - falloff = 1.0f - falloff; - falloff = 1.0f - (falloff * falloff); - mask_short = (unsigned short)(projPixel->mask * mask); if (mask_short > projPixel->mask_max) { diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index cb94b2cc83a..b5c74eea30e 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -403,11 +403,11 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc #undef LOG2I -static int outliner_animdata_test(AnimData *adt) +static bool outliner_animdata_test(AnimData *adt) { if (adt) return (adt->action || adt->drivers.first || adt->nla_tracks.first); - return 0; + return false; } static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te) |