Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(10)

Unified Diff: source/blender/makesdna/DNA_customdata_types.h

Issue 6135048: Sculpt masking (Closed) Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Update to apply cleanly against trunk and fixed up some code style Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- source/blender/makesdna/DNA_customdata_types.h (revision 46370)
+++ source/blender/makesdna/DNA_customdata_types.h (working copy)
@@ -63,7 +63,7 @@ typedef struct CustomDataExternal {
* layers, each with a data type (e.g. MTFace, MDeformVert, etc.). */
typedef struct CustomData {
CustomDataLayer *layers; /* CustomDataLayers, ordered by type */
- int typemap[34]; /* runtime only! - maps types to indices of first layer of that type,
+ int typemap[36]; /* runtime only! - maps types to indices of first layer of that type,
* MUST be >= CD_NUMTYPES, but we cant use a define here.
* Correct size is ensured in CustomData_update_typemap assert() */
@@ -112,7 +112,10 @@ typedef struct CustomData {
#define CD_BM_ELEM_PYPTR 33
/* BMESH ONLY END */
-#define CD_NUMTYPES 34
+#define CD_PAINT_MASK 34
+#define CD_GRID_PAINT_MASK 35
+
+#define CD_NUMTYPES 36
/* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT)
@@ -151,6 +154,9 @@ typedef struct CustomData {
#define CD_MASK_BM_ELEM_PYPTR (1LL << CD_BM_ELEM_PYPTR)
/* BMESH ONLY END */
+#define CD_MASK_PAINT_MASK (1LL << CD_PAINT_MASK)
+#define CD_MASK_GRID_PAINT_MASK (1LL << CD_GRID_PAINT_MASK)
+
/* CustomData.flag */
/* indicates layer should not be copied by CustomData_from_template or

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b