Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-30 15:10:54 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-30 15:10:54 +0300
commit2ae67de94437162a9d429850b04a295fa393d971 (patch)
tree6419beb6c0b812dd1ae076a824d02ac72dd49055 /source
parent820d19162678a478bac6a0945e2111b11bbea91e (diff)
Fix T45577 tiled sculpting not working with brushes requiring a sculpt
plane. Make sure sculpt plane is recalculated for every tiled dab. Note this is not the optimum thing to do, we could cache the original sculpt plane and reuse that, but this would require us to rearrange the logic of tiled sculpting somewhat. This can be a TODO, but for now this will fix the issue.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c3
-rw-r--r--source/blender/makesdna/DNA_scene_types.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d03b5b4343d..dd10836ef9a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2501,7 +2501,8 @@ static void calc_sculpt_plane(
if (ss->cache->mirror_symmetry_pass == 0 &&
ss->cache->radial_symmetry_pass == 0 &&
- (ss->cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL)))
+ (ss->cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL) ||
+ (sd->paint.symmetry_flags & PAINT_TILE_AXIS_ALL)))
{
switch (brush->sculpt_plane) {
case SCULPT_DISP_DIR_VIEW:
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index fd6d39c9ce6..16e530127a7 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1826,6 +1826,7 @@ typedef enum SymmetryFlags {
} SymmetryFlags;
#define PAINT_SYMM_AXIS_ALL (PAINT_SYMM_X | PAINT_SYMM_Y | PAINT_SYMM_Z)
+#define PAINT_TILE_AXIS_ALL (PAINT_TILE_X | PAINT_TILE_Y | PAINT_TILE_Z)
/* Sculpt.flags */
/* These can eventually be moved to paint flags? */