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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-05-17 15:08:50 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-05-17 15:08:50 +0400
commita4e9edb6743769bd9f8fd3e24bd11fd1878d510a (patch)
treeb28acffae3e60c5daf1a3619169ed74505619fa8 /source/blender/editors/sculpt_paint
parent79fc2ac8459a4632afca757981a4f38aaa8364c9 (diff)
Fix #35393: Sculpt Shortcuts are bananas.
Issue was introduced by self in svn rev56815. Brushes list was simply not fully traversing due to mistake in termination condition.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r--source/blender/editors/sculpt_paint/paint_ops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index a30566d5b3f..6969b3bd9f0 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -271,16 +271,16 @@ static Brush *brush_tool_cycle(Main *bmain, Brush *brush_orig, const int tool, c
}
/* get the next brush with the active tool */
- for (brush = first_brush;
- brush != brush_orig;
- brush = brush->id.next ? brush->id.next : bmain->brush.first)
- {
+ brush = first_brush;
+ do {
if ((brush->ob_mode & ob_mode) &&
(brush_tool(brush, tool_offset) == tool))
{
return brush;
}
- }
+
+ brush = brush->id.next ? brush->id.next : bmain->brush.first;
+ } while (brush != first_brush);
return NULL;
}