[Bf-blender-cvs] [d369d779f68] greasepencil-object: Merge branch 'master' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Thu Mar 5 22:01:21 CET 2020
Commit: d369d779f68ca47640dd27738a747a9320217692
Author: Antonio Vazquez
Date: Thu Mar 5 21:59:52 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd369d779f68ca47640dd27738a747a9320217692
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenkernel/intern/object.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/object.c
index 57e2b5ae920,3fded3e5881..f2c3ccc9988
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -893,17 -1079,6 +1086,10 @@@ void BKE_object_init(Object *ob, const
ob->trackflag = OB_NEGZ;
ob->upflag = OB_POSY;
}
- else {
- ob->trackflag = OB_POSY;
- ob->upflag = OB_POSZ;
- }
+
+ if (ob->type == OB_GPENCIL) {
+ ob->dtx |= OB_USE_GPENCIL_LIGHTS;
+ }
-
- /* Animation Visualization defaults */
- animviz_settings_init(&ob->avs);
}
/* more general add: creates minimum required data, but without vertices etc. */
diff --cc source/blender/makesdna/DNA_brush_types.h
index fdef0b3602b,0109fba909b..3f703558e54
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -286,40 -225,9 +286,41 @@@ typedef enum eBrushClothForceFalloffTyp
BRUSH_CLOTH_FORCE_FALLOFF_PLANE = 1,
} eBrushClothForceFalloffType;
+/* Gpencilsettings.Vertex_mode */
+typedef enum eGp_Vertex_Mode {
+ /* Affect to Stroke only. */
+ GPPAINT_MODE_STROKE = 0,
+ /* Affect to Fill only. */
+ GPPAINT_MODE_FILL = 1,
+ /* Affect to both. */
+ GPPAINT_MODE_BOTH = 2,
+} eGp_Vertex_Mode;
+
+/* sculpt_flag */
+typedef enum eGP_Sculpt_Flag {
+ /* invert the effect of the brush */
+ GP_SCULPT_FLAG_INVERT = (1 << 0),
+ /* smooth brush affects pressure values as well */
+ GP_SCULPT_FLAG_SMOOTH_PRESSURE = (1 << 2),
+ /* temporary invert action */
+ GP_SCULPT_FLAG_TMP_INVERT = (1 << 3),
+} eGP_Sculpt_Flag;
+
+/* sculpt_mode_flag */
+typedef enum eGP_Sculpt_Mode_Flag {
+ /* apply brush to position */
+ GP_SCULPT_FLAGMODE_APPLY_POSITION = (1 << 0),
+ /* apply brush to strength */
+ GP_SCULPT_FLAGMODE_APPLY_STRENGTH = (1 << 1),
+ /* apply brush to thickness */
+ GP_SCULPT_FLAGMODE_APPLY_THICKNESS = (1 << 2),
+ /* apply brush to uv data */
+ GP_SCULPT_FLAGMODE_APPLY_UV = (1 << 3),
+} eGP_Sculpt_Mode_Flag;
+
typedef enum eAutomasking_flag {
BRUSH_AUTOMASKING_TOPOLOGY = (1 << 0),
+ BRUSH_AUTOMASKING_FACE_SETS = (1 << 1),
} eAutomasking_flag;
typedef struct Brush {
More information about the Bf-blender-cvs
mailing list