[Bf-blender-cvs] [5c74c9c3339] greasepencil-object: GPencil: Fix struct padding after merge
Antonio Vazquez
noreply at git.blender.org
Thu Nov 21 22:35:44 CET 2019
Commit: 5c74c9c33390bd4dbf462ed0246246e2ad47f549
Author: Antonio Vazquez
Date: Thu Nov 21 22:35:33 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5c74c9c33390bd4dbf462ed0246246e2ad47f549
GPencil: Fix struct padding after merge
===================================================================
M source/blender/makesdna/DNA_brush_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 1862317d701..2d685388ea1 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -425,6 +425,7 @@ typedef struct Brush {
float mask_stencil_pos[2];
float mask_stencil_dimension[2];
+ char _pad3[4];
struct BrushGpencilSettings *gpencil_settings;
} Brush;
@@ -606,20 +607,23 @@ typedef enum eBrushUVSculptTool {
#define SCULPT_TOOL_HAS_RAKE(t) ELEM(t, SCULPT_TOOL_SNAKE_HOOK)
#define SCULPT_TOOL_HAS_DYNTOPO(t) \
- (ELEM(t, /* These brushes, as currently coded, cannot support dynamic topology */ \
- SCULPT_TOOL_GRAB, \
- SCULPT_TOOL_ROTATE, \
- SCULPT_TOOL_THUMB, \
- SCULPT_TOOL_LAYER, \
- SCULPT_TOOL_DRAW_SHARP, \
- SCULPT_TOOL_TOPOLOGY, \
- SCULPT_TOOL_ELASTIC_DEFORM, \
- SCULPT_TOOL_POSE, \
+ (ELEM( \
+ t, /* These brushes, as currently coded, cannot support dynamic topology */ \
+ SCULPT_TOOL_GRAB, \
+ SCULPT_TOOL_ROTATE, \
+ SCULPT_TOOL_THUMB, \
+ SCULPT_TOOL_LAYER, \
+ SCULPT_TOOL_DRAW_SHARP, \
+ SCULPT_TOOL_TOPOLOGY, \
+ SCULPT_TOOL_ELASTIC_DEFORM, \
+ SCULPT_TOOL_POSE, \
\
- /* These brushes could handle dynamic topology, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
- * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ but user feedback indicates it's better not to */ \
- SCULPT_TOOL_SMOOTH, \
- SCULPT_TOOL_MASK) == 0)
+ /* These brushes could handle dynamic topology, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
+ * \ \
+ * \ \ \
+ * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ but user feedback indicates it's better not to */ \
+ SCULPT_TOOL_SMOOTH, \
+ SCULPT_TOOL_MASK) == 0)
#define SCULPT_TOOL_HAS_TOPOLOGY_RAKE(t) \
(ELEM(t, /* These brushes, as currently coded, cannot support topology rake. */ \
More information about the Bf-blender-cvs
mailing list