Style changes to refactor commit.
authorAntony Riakiotakis <kalast@gmail.com>
Tue, 10 Dec 2013 02:27:53 +0000 (04:27 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Tue, 10 Dec 2013 02:28:16 +0000 (04:28 +0200)
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/makesdna/DNA_scene_types.h

index 2dc6babdfa6a457da99494c086b80ad5bc2024f0..8f4454eb2da828f6bb7a7d4282d8d93957be6c7d 100644 (file)
@@ -830,11 +830,8 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 
        /* don't calculate rake angles while a stroke is active because the rake variables are global and
         * we may get interference with the stroke itself. For line strokes, such interference is visible */
-       if (!ups->stroke_active) {
-               if (brush->flag & BRUSH_RAKE)
-                       /* here, translation contains the mouse coordinates. */
-                       paint_calculate_rake_rotation(ups, translation);
-       }
+       if (!ups->stroke_active && (brush->flag & BRUSH_RAKE))
+               paint_calculate_rake_rotation(ups, translation);
 
        /* draw overlay */
        paint_draw_alpha_overlay(ups, brush, &vc, x, y, zoomx, mode);
index c421080956bf377fc9a6126b0f3a6a045daf205e..320bf4f0f5ec921f3f27bd8d7635db4de399812a 100644 (file)
@@ -198,7 +198,7 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU
        PBVH *pbvh;
        PBVHNode **nodes;
        int totnode, i, symmpass;
-       int symm = sd->paint.symmetry_flags & 7;
+       int symm = sd->paint.symmetry_flags & PAINT_SYMM_AXIS_ALL;
 
        mode = PAINT_MASK_FLOOD_VALUE;
        value = select ? 1.0 : 0.0;
index b8a082398ef0c53c6dbe2071f6549139e40203a4..fa938eca48779eeb43abf4c66ea84c2f16701f02 100644 (file)
@@ -3467,7 +3467,7 @@ static void do_symmetrical_brush_actions(Sculpt *sd, Object *ob,
        Brush *brush = BKE_paint_brush(&sd->paint);
        SculptSession *ss = ob->sculpt;
        StrokeCache *cache = ss->cache;
-       const char symm = sd->paint.symmetry_flags & 7;
+       const char symm = sd->paint.symmetry_flags & PAINT_SYMM_AXIS_ALL;
        int i;
 
        float feather = calc_symmetry_feather(sd, ss->cache);
index 6d766572ec68ca8bb63df51bf2a6cf7a007523ff..9be3f395fbd03396c6805686a5c06ca45adc3423 100644 (file)
@@ -140,7 +140,7 @@ static void draw_uvs_shadow(Object *obedit)
 
        const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
 
-       /* draws the gray mesh when painting */
+       /* draws the mesh when painting */
        UI_ThemeColor(TH_UV_SHADOW);
 
        BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
index 5f2021ea8260ace18438537cf3022fdfa9613969..86145de32914aabe0f2ae86be4692aed64565fe4 100644 (file)
@@ -1590,6 +1590,8 @@ typedef enum SymmetryFlags {
        PAINT_SYMMETRY_FEATHER = (1 << 3)
 } SymmetryFlags;
 
+#define PAINT_SYMM_AXIS_ALL (PAINT_SYMM_X | PAINT_SYMM_Y | PAINT_SYMM_Z)
+
 /* Sculpt.flags */
 /* These can eventually be moved to paint flags? */
 typedef enum SculptFlags {