Commit: 07d09267964b70893d81e2d2fd6958ad6075e16c
Author: Antony Riakiotakis
Date: Tue Dec 10 04:27:53 2013 +0200
http://developer.blender.org/rB07d09267964b70893d81e2d2fd6958ad6075e16c
Style changes to refactor commit.
===================================================================
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/sculpt_paint/paint_mask.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c
b/source/blender/editors/sculpt_paint/paint_cursor.c
index 2dc6bab..8f4454e 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -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);
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c
b/source/blender/editors/sculpt_paint/paint_mask.c
index c421080..320bf4f 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -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;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c
b/source/blender/editors/sculpt_paint/sculpt.c
index b8a0823..fa938ec 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -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);
diff --git a/source/blender/editors/uvedit/uvedit_draw.c
b/source/blender/editors/uvedit/uvedit_draw.c
index 6d76657..9be3f39 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -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) {
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index 5f2021e..86145de 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
