[Bf-blender-cvs] [d56a035f7df] greasepencil-object: Fix enum after merge
Antonio Vazquez
noreply at git.blender.org
Tue Feb 6 16:30:14 CET 2018
Commit: d56a035f7df18e541ee59d1d394b5df33b14649c
Author: Antonio Vazquez
Date: Tue Feb 6 16:30:04 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd56a035f7df18e541ee59d1d394b5df33b14649c
Fix enum after merge
The code has been moved to new header file, so new definitions were missed.
===================================================================
M source/blender/makesdna/DNA_object_enums.h
===================================================================
diff --git a/source/blender/makesdna/DNA_object_enums.h b/source/blender/makesdna/DNA_object_enums.h
index 58f9e29297f..bebf2c0f131 100644
--- a/source/blender/makesdna/DNA_object_enums.h
+++ b/source/blender/makesdna/DNA_object_enums.h
@@ -37,7 +37,10 @@ typedef enum eObjectMode {
OB_MODE_TEXTURE_PAINT = 1 << 4,
OB_MODE_PARTICLE_EDIT = 1 << 5,
OB_MODE_POSE = 1 << 6,
- OB_MODE_GPENCIL = 1 << 7, /* NOTE: Just a dummy to make the UI nicer */
+ OB_MODE_GPENCIL_EDIT = 1 << 7,
+ OB_MODE_GPENCIL_PAINT = 1 << 8,
+ OB_MODE_GPENCIL_SCULPT = 1 << 9,
+ OB_MODE_GPENCIL_WEIGHT = 1 << 10,
} eObjectMode;
/* Any mode where the brush system is used. */
More information about the Bf-blender-cvs
mailing list