|
This patch limits each brush to a single paint tool. It converts Brush.ob_mode to Brush.paint_mode, where paint mode can be: BRUSH_MODE_NONE, BRUSH_MODE_SCULPT, BRUSH_MODE_VERTEX_WEIGHT_PAINT, BRUSH_MODE_TEXTURE_PAINT, or BRUSH_MODE_UV_SCULPT.
During file read, brushes with more than one ob_mode are split in to multiple brushes.
The purpose of this is to simplify brush code. You can now tell which brush tool is in use with just the brush pointer, rather than having to check the current object mode. This would be nice for RNA in particular.
This is a bit rough, wanted to see if there's interest in doing this first (see mail to bf-committers.)
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+163 lines, -164 lines) |
Patch |
|
|
release/scripts/startup/bl_ui/space_view3d_toolbar.py
|
View
|
1
|
1 chunk |
+1 line, -4 lines |
0 comments
|
Download
|
|
|
source/blender/blenkernel/BKE_brush.h
|
View
|
1
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
|
source/blender/blenkernel/intern/brush.c
|
View
|
1
|
4 chunks |
+11 lines, -7 lines |
0 comments
|
Download
|
|
|
source/blender/blenkernel/intern/paint.c
|
View
|
1
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
|
|
source/blender/blenloader/intern/readfile.c
|
View
|
1
|
1 chunk |
+54 lines, -0 lines |
0 comments
|
Download
|
|
|
source/blender/editors/sculpt_paint/paint_ops.c
|
View
|
1
|
6 chunks |
+86 lines, -125 lines |
0 comments
|
Download
|
|
|
source/blender/makesdna/DNA_brush_types.h
|
View
|
1
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
|
source/blender/makesrna/intern/rna_brush.c
|
View
|
1
|
1 chunk |
+0 lines, -17 lines |
0 comments
|
Download
|
|
|
source/blender/makesrna/intern/rna_main_api.c
|
View
|
1
|
3 chunks |
+6 lines, -2 lines |
0 comments
|
Download
|
|
|
source/blender/makesrna/intern/rna_sculpt_paint.c
|
View
|
1
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
|
source/blender/makesrna/intern/rna_space.c
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
Total messages: 4
|