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:
authorNicholas Bishop <nicholasbishop@gmail.com>2009-03-11 03:43:08 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2009-03-11 03:43:08 +0300
commit33509e851077fa108bfb1e8934098d67e6b1b16f (patch)
tree1c464e1fcb10b4549eb90cb4becd77c3531d269b /source/blender/makesdna
parent47311475ba16b59b7e5751cc63d5800bdd971586 (diff)
Changed vertexpaint and weightpaint to use the standard Brush struct, so they too work with the brush panel.
Note: these modes are only using color/alpha/size from Brush, so there's more integration work todo yet.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 0dff3cdb43d..067e3d0c2d0 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -401,10 +401,9 @@ typedef struct Sculpt
} Sculpt;
typedef struct VPaint {
- float r, g, b, a; /* paint color */
- float weight; /* weight paint */
- float size; /* of brush */
- float gamma, mul;
+ struct Brush *brush;
+
+ float gamma, mul; /* should become part of struct Brush? */
short mode, flag;
int tot; /* allocation size of prev buffers */
unsigned int *vpaint_prev; /* previous mesh colors */