[Bf-blender-cvs] [d12d9f0] soc-2013-paint: Remove jitter from brush cache tests it is also unneeded.

[Antony Riakiotakis]

Commit: d12d9f07c4b3f0d7a9f9610121e1ee1c6aea521b
Author: Antony Riakiotakis
Date:   Mon Mar 10 23:54:07 2014 +0200
https://developer.blender.org/rBd12d9f07c4b3f0d7a9f9610121e1ee1c6aea521b

Remove jitter from brush cache tests it is also unneeded.

===================================================================

M       source/blender/editors/sculpt_paint/paint_image_2d.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c 
b/source/blender/editors/sculpt_paint/paint_image_2d.c
index 3be3a81..c5bb760 100644
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@ -83,7 +83,6 @@ typedef struct BrushPainterCache {
        bool is_maskbrush;
 
        int lastdiameter;
-       float lastjitter;
        float last_tex_rotation;
        float last_mask_rotation;
        float last_pressure;
@@ -596,7 +595,10 @@ static void brush_painter_2d_refresh_cache(ImagePaintState 
*s, BrushPainter *pai
                        brush_painter_2d_tex_mapping(s, diameter, 
painter->startpaintpos, pos, mouse,
                                                                                
 brush->mask_mtex.brush_map_mode, &painter->mask_mapping);
 
-                       cache->tex_mask = brush_painter_mask_ibuf_new(painter, 
diameter);
+                       if (do_partial_update_mask)
+                               cache->tex_mask = 
brush_painter_mask_ibuf_new(painter, diameter);
+                       else
+                               cache->tex_mask = 
brush_painter_mask_ibuf_new(painter, diameter);
                        cache->last_mask_rotation = mask_rotation;
                }
        }
@@ -613,7 +615,6 @@ static void brush_painter_2d_refresh_cache(ImagePaintState 
*s, BrushPainter *pai
 
        /* detect if we need to recreate image brush buffer */
        if (diameter != cache->lastdiameter ||
-           brush->jitter != cache->lastjitter ||
                tex_rotation != cache->last_tex_rotation ||
            do_random ||
            update_color)
@@ -633,7 +634,6 @@ static void brush_painter_2d_refresh_cache(ImagePaintState 
*s, BrushPainter *pai
                }
 
                cache->lastdiameter = diameter;
-               cache->lastjitter = brush->jitter;
                cache->last_tex_rotation = tex_rotation;
                cache->last_pressure = pressure;
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs