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:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_ID.h6
-rw-r--r--source/blender/makesdna/DNA_ID_enums.h4
-rw-r--r--source/blender/makesdna/DNA_action_types.h2
-rw-r--r--source/blender/makesdna/DNA_anim_types.h16
-rw-r--r--source/blender/makesdna/DNA_armature_types.h10
-rw-r--r--source/blender/makesdna/DNA_brush_defaults.h2
-rw-r--r--source/blender/makesdna/DNA_camera_types.h8
-rw-r--r--source/blender/makesdna/DNA_cloth_types.h4
-rw-r--r--source/blender/makesdna/DNA_constraint_types.h16
-rw-r--r--source/blender/makesdna/DNA_curveprofile_types.h2
-rw-r--r--source/blender/makesdna/DNA_fluid_types.h6
-rw-r--r--source/blender/makesdna/DNA_gpencil_types.h4
-rw-r--r--source/blender/makesdna/DNA_ipo_types.h2
-rw-r--r--source/blender/makesdna/DNA_key_types.h8
-rw-r--r--source/blender/makesdna/DNA_material_types.h2
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h8
-rw-r--r--source/blender/makesdna/DNA_object_types.h6
-rw-r--r--source/blender/makesdna/DNA_scene_types.h3
-rw-r--r--source/blender/makesdna/DNA_shader_fx_types.h4
-rw-r--r--source/blender/makesdna/DNA_tracking_types.h4
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h6
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h2
-rw-r--r--source/blender/makesdna/intern/makesdna.c16
23 files changed, 73 insertions, 68 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index dd262f78f6b..16f5f0b4ae8 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -79,8 +79,8 @@ typedef struct IDProperty {
/** Note, alignment for 64 bits. */
IDPropertyData data;
- /* array length, also (this is important!) string length + 1.
- * the idea is to be able to reuse array realloc functions on strings.*/
+ /* Array length, also (this is important!) string length + 1.
+ * the idea is to be able to reuse array realloc functions on strings. */
int len;
/* Strings and arrays are both buffered, though the buffer isn't saved. */
@@ -141,7 +141,7 @@ enum {
IDP_FLAG_GHOST = 1 << 7,
};
-/* add any future new id property types here.*/
+/* add any future new id property types here. */
/* Static ID override structs. */
diff --git a/source/blender/makesdna/DNA_ID_enums.h b/source/blender/makesdna/DNA_ID_enums.h
index 04cbf51dd62..45faf9e7f57 100644
--- a/source/blender/makesdna/DNA_ID_enums.h
+++ b/source/blender/makesdna/DNA_ID_enums.h
@@ -43,7 +43,7 @@ enum eIconSizes {
/* big endian */
# define MAKE_ID2(c, d) ((c) << 8 | (d))
#else
-/* little endian */
+/* little endian */
# define MAKE_ID2(c, d) ((d) << 8 | (c))
#endif
@@ -86,7 +86,7 @@ typedef enum ID_Type {
ID_MSK = MAKE_ID2('M', 'S'), /* Mask */
ID_LS = MAKE_ID2('L', 'S'), /* FreestyleLineStyle */
ID_PAL = MAKE_ID2('P', 'L'), /* Palette */
- ID_PC = MAKE_ID2('P', 'C'), /* PaintCurve */
+ ID_PC = MAKE_ID2('P', 'C'), /* PaintCurve */
ID_CF = MAKE_ID2('C', 'F'), /* CacheFile */
ID_WS = MAKE_ID2('W', 'S'), /* WorkSpace */
ID_LP = MAKE_ID2('L', 'P'), /* LightProbe */
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index a5ed870ee78..b6ffefb55e0 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -861,7 +861,7 @@ typedef enum eSAction_Flag {
SACTION_NOTRANSKEYCULL = (1 << 4),
/* don't include keyframes that are out of view */
// SACTION_HORIZOPTIMISEON = (1 << 5), // XXX deprecated... old irrelevant trick
- /* show pose-markers (local to action) in Action Editor mode */
+ /* show pose-markers (local to action) in Action Editor mode. */
SACTION_POSEMARKERS_SHOW = (1 << 6),
/* don't draw action channels using group colors (where applicable) */
/* SACTION_NODRAWGCOLORS = (1 << 7), DEPRECATED */
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index dffb3588de4..fadf8ba36b0 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -543,7 +543,7 @@ typedef enum eDriver_Types {
/** Driver flags. */
typedef enum eDriver_Flags {
- /** Driver has invalid settings (internal flag) */
+ /** Driver has invalid settings (internal flag). */
DRIVER_FLAG_INVALID = (1 << 0),
DRIVER_FLAG_DEPRECATED = (1 << 1),
/** Driver does replace value, but overrides (for layering of animation over driver) */
@@ -647,15 +647,15 @@ typedef struct FCurve {
/* user-editable flags/settings */
typedef enum eFCurve_Flags {
- /** curve/keyframes are visible in editor */
+ /** Curve/keyframes are visible in editor */
FCURVE_VISIBLE = (1 << 0),
- /** curve is selected for editing */
+ /** Curve is selected for editing. */
FCURVE_SELECTED = (1 << 1),
- /** curve is active one */
+ /** Curve is active one. */
FCURVE_ACTIVE = (1 << 2),
- /** keyframes (beztriples) cannot be edited */
+ /** Keyframes (beztriples) cannot be edited. */
FCURVE_PROTECTED = (1 << 3),
- /** fcurve will not be evaluated for the next round */
+ /** FCurve will not be evaluated for the next round. */
FCURVE_MUTED = (1 << 4),
/** fcurve uses 'auto-handles', which stay horizontal... */
@@ -677,9 +677,9 @@ typedef enum eFCurve_Flags {
/* extrapolation modes (only simple value 'extending') */
typedef enum eFCurve_Extend {
- /** just extend min/max keyframe value */
+ /** Just extend min/max keyframe value. */
FCURVE_EXTRAPOLATE_CONSTANT = 0,
- /** just extend gradient of segment between first segment keyframes */
+ /** Just extend gradient of segment between first segment keyframes. */
FCURVE_EXTRAPOLATE_LINEAR,
} eFCurve_Extend;
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index 3d83d0d2f6f..0bb9a0837f1 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -170,15 +170,15 @@ typedef enum eArmature_Flag {
ARM_FLAG_UNUSED_7 = (1 << 7),
ARM_MIRROR_EDIT = (1 << 8),
ARM_FLAG_UNUSED_9 = (1 << 9),
- /** made option negative, for backwards compat */
+ /** Made option negative, for backwards compatibility. */
ARM_NO_CUSTOM = (1 << 10),
- /** draw custom colors */
+ /** Draw custom colors. */
ARM_COL_CUSTOM = (1 << 11),
- /** when ghosting, only show selected bones (this should belong to ghostflag instead) */
+ /** When ghosting, only show selected bones (this should belong to ghostflag instead). */
ARM_FLAG_UNUSED_12 = (1 << 12), /* cleared */
- /** dopesheet channel is expanded */
+ /** Dope-sheet channel is expanded */
ARM_DS_EXPAND = (1 << 13),
- /** other objects are used for visualizing various states (hack for efficient updates) */
+ /** Other objects are used for visualizing various states (hack for efficient updates). */
ARM_HAS_VIZ_DEPS = (1 << 14),
} eArmature_Flag;
diff --git a/source/blender/makesdna/DNA_brush_defaults.h b/source/blender/makesdna/DNA_brush_defaults.h
index fb726e24929..c3f171977a9 100644
--- a/source/blender/makesdna/DNA_brush_defaults.h
+++ b/source/blender/makesdna/DNA_brush_defaults.h
@@ -88,7 +88,7 @@
.cursor_overlay_alpha = 33, \
.overlay_flags = 0, \
\
- /* brush appearance */ \
+ /* Brush appearance. */ \
\
/* add mode color is light red */ \
.add_col = {1.0, 0.39, 0.39, 0.9}, \
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 73a55edf05f..32ebcade76d 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -202,8 +202,10 @@ enum {
CAM_BGIMG_FLAG_FOREGROUND = (1 << 4),
/* Camera framing options */
- CAM_BGIMG_FLAG_CAMERA_ASPECT = (1 << 5), /* don't stretch to fit the camera view */
- CAM_BGIMG_FLAG_CAMERA_CROP = (1 << 6), /* crop out the image */
+ /** Don't stretch to fit the camera view. */
+ CAM_BGIMG_FLAG_CAMERA_ASPECT = (1 << 5),
+ /** Crop out the image. */
+ CAM_BGIMG_FLAG_CAMERA_CROP = (1 << 6),
/* Axis flip options */
CAM_BGIMG_FLAG_FLIP_X = (1 << 7),
@@ -211,7 +213,7 @@ enum {
};
/* CameraBGImage->source */
-/* may want to use 1 for select ?*/
+/* may want to use 1 for select? */
enum {
CAM_BGIMG_SOURCE_IMAGE = 0,
CAM_BGIMG_SOURCE_MOVIE = 1,
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index aae29e5fddc..e2eea5e5422 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -141,7 +141,7 @@ typedef struct ClothSimSettings {
short solver_type;
/** Vertex group for scaling bending stiffness. */
short vgroup_bend;
- /** Optional vertexgroup name for assigning weight..*/
+ /** Optional vertexgroup name for assigning weight. */
short vgroup_mass;
/** Vertex group for scaling structural stiffness. */
short vgroup_struct;
@@ -184,7 +184,7 @@ typedef struct ClothSimSettings {
} ClothSimSettings;
-/* SIMULATION FLAGS: goal flags,.. */
+/* SIMULATION FLAGS: goal flags, etc. */
/* These are the bits used in SimSettings.flags. */
typedef enum {
/** Object is only collision object, no cloth simulation is done. */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index a94bc4625df..1e4fd2a70f2 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -51,9 +51,9 @@ typedef struct bConstraint {
/** Constraint data (a valid constraint type). */
void *data;
- /** Constraint type. */
+ /** Constraint type. */
short type;
- /** Flag - General Settings. */
+ /** Flag - General Settings. */
short flag;
/** Space that owner should be evaluated in. */
@@ -89,7 +89,7 @@ typedef struct bConstraint {
float rot_error;
} bConstraint;
-/* Multiple-target constraints --------------------- */
+/* Multiple-target constraints --------------------- */
/* This struct defines a constraint target.
* It is used during constraint solving regardless of how many targets the
@@ -257,7 +257,7 @@ typedef struct bArmatureConstraint {
ListBase targets;
} bArmatureConstraint;
-/* Single-target subobject constraints --------------------- */
+/* Single-target subobject constraints --------------------- */
/* Track To Constraint */
typedef struct bTrackToConstraint {
@@ -517,7 +517,7 @@ typedef struct bPivotConstraint {
short flag;
} bPivotConstraint;
-/* transform limiting constraints - zero target ---------------------------- */
+/* transform limiting constraints - zero target ---------------------------- */
/* Limit Location Constraint */
typedef struct bLocLimitConstraint {
float xmin, xmax;
@@ -721,7 +721,7 @@ typedef enum eBConstraint_Flags {
CONSTRAINT_BBONE_SHAPE = (1 << 10),
/* That constraint has been inserted in local override (i.e. it can be fully edited!). */
CONSTRAINT_OVERRIDE_LIBRARY_LOCAL = (1 << 11),
- /* use full transformation (not just segment locations) - only set at runtime */
+ /* use full transformation (not just segment locations) - only set at runtime. */
CONSTRAINT_BBONE_SHAPE_FULL = (1 << 12),
} eBConstraint_Flags;
@@ -1065,7 +1065,7 @@ typedef enum eTransformLimits_Flags2 {
LIMIT_TRANSFORM = (1 << 1),
} eTransformLimits_Flags2;
-/* transform limiting constraints -> flag (own flags) */
+/* transform limiting constraints -> flag (own flags). */
typedef enum eTransformLimits_Flags {
LIMIT_XMIN = (1 << 0),
LIMIT_XMAX = (1 << 1),
@@ -1075,7 +1075,7 @@ typedef enum eTransformLimits_Flags {
LIMIT_ZMAX = (1 << 5),
} eTransformLimits_Flags;
-/* limit rotation constraint -> flag (own flags) */
+/* limit rotation constraint -> flag (own flags). */
typedef enum eRotLimit_Flags {
LIMIT_XROT = (1 << 0),
LIMIT_YROT = (1 << 1),
diff --git a/source/blender/makesdna/DNA_curveprofile_types.h b/source/blender/makesdna/DNA_curveprofile_types.h
index 450155a32e1..7c76251adc3 100644
--- a/source/blender/makesdna/DNA_curveprofile_types.h
+++ b/source/blender/makesdna/DNA_curveprofile_types.h
@@ -72,7 +72,7 @@ typedef struct CurveProfile {
short segments_len;
/** Preset to use when reset. */
int preset;
- /** Sequence of points defining the shape of the curve. */
+ /** Sequence of points defining the shape of the curve. */
CurveProfilePoint *path;
/** Display and evaluation table at higher resolution for curves. */
CurveProfilePoint *table;
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h
index e787b44e557..5e36c5673a4 100644
--- a/source/blender/makesdna/DNA_fluid_types.h
+++ b/source/blender/makesdna/DNA_fluid_types.h
@@ -289,7 +289,7 @@ enum {
#define FLUID_NAME_PARTICLES "fluid_particles"
#define FLUID_NAME_GUIDING "fluid_guiding"
-/* Fluid object names.*/
+/* Fluid object names. */
#define FLUID_NAME_FLAGS "flags" /* == OpenVDB grid attribute name. */
#define FLUID_NAME_VELOCITY "velocity" /* == OpenVDB grid attribute name. */
#define FLUID_NAME_VEL "vel"
@@ -813,8 +813,8 @@ typedef struct FluidFlowSettings {
char uvlayer_name[64];
short vgroup_density;
- short type; /* Smoke, flames, both, outflow, liquid. */
- short behavior; /* Inflow, outflow, static. */
+ short type; /* Smoke, flames, both, outflow, liquid. */
+ short behavior; /* Inflow, outflow, static. */
short source;
short texture_type;
short _pad3[3];
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 6b7b89e91fa..6bedcb648c6 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -309,7 +309,7 @@ typedef struct bGPDstroke {
float uv_translation[2];
float uv_scale;
- /** Stroke selection index.*/
+ /** Stroke selection index. */
int select_index;
char _pad4[4];
@@ -614,7 +614,7 @@ typedef struct bGPdata_Runtime {
/** Vertex Color applied to Fill (while drawing). */
float vert_color_fill[4];
- /** Arrow points for stroke corners **/
+ /** Arrow points for stroke corners. */
float arrow_start[8];
float arrow_end[8];
/* Arrow style for each corner */
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index c5e207c4e20..cc467f36666 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -511,7 +511,7 @@ typedef struct Ipo {
/* ---------- IPO Drivers ----------- */
-/* offset in driver->name for finding second posechannel for rot-diff */
+/* Offset in driver->name for finding second posechannel for rot-diff. */
#define DRIVER_NAME_OFFS 32
/* driver->type */
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 9789d0d3520..228a1024721 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -46,10 +46,10 @@ typedef struct KeyBlock {
* so this value increments by 0.1f per frame.
*/
float pos;
- /** influence (typically [0 - 1] but can be more), (Key->type == KEY_RELATIVE) only.*/
+ /** influence (typically [0 - 1] but can be more), `(Key->type == KEY_RELATIVE)` only. */
float curval;
- /** interpolation type (Key->type == KEY_NORMAL) only. */
+ /** Interpolation type `(Key->type == KEY_NORMAL)` only. */
short type;
char _pad1[2];
@@ -62,7 +62,7 @@ typedef struct KeyBlock {
/** for meshes only, match the unique number with the customdata layer */
int uid;
- /** array of shape key values, size is (Key->elemsize * KeyBlock->totelem) */
+ /** array of shape key values, size is `(Key->elemsize * KeyBlock->totelem)` */
void *data;
/** MAX_NAME (unique name, user assigned) */
char name[64];
@@ -81,7 +81,7 @@ typedef struct Key {
struct AnimData *adt;
/**
- * commonly called 'Basis', (Key->type == KEY_RELATIVE) only.
+ * commonly called 'Basis', `(Key->type == KEY_RELATIVE)` only.
* Looks like this is _always_ 'key->block.first',
* perhaps later on it could be defined as some other KeyBlock - campbell
*/
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 55d5ea202f7..5bc8370a159 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -40,7 +40,7 @@ struct Image;
struct Ipo;
struct bNodeTree;
-/* WATCH IT: change type? also make changes in ipo.h */
+/* WATCH IT: change type? also make changes in ipo.h */
typedef struct TexPaintSlot {
/** Image to be painted on. */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index c61e940190f..158b00b9302 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -299,13 +299,13 @@ enum {
typedef struct ArrayModifierData {
ModifierData modifier;
- /* the object with which to cap the start of the array */
+ /* the object with which to cap the start of the array. */
struct Object *start_cap;
- /* the object with which to cap the end of the array */
+ /* the object with which to cap the end of the array. */
struct Object *end_cap;
- /* the curve object to use for MOD_ARR_FITCURVE */
+ /* the curve object to use for MOD_ARR_FITCURVE. */
struct Object *curve_ob;
- /* the object to use for object offset */
+ /* the object to use for object offset. */
struct Object *offset_ob;
/* a constant duplicate offset;
* 1 means the duplicates are 1 unit apart
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 9951bdefbbb..527b162a76d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -476,7 +476,7 @@ typedef struct ObHook {
/* **************** OBJECT ********************* */
-/* used many places... should be specialized */
+/* used many places, should be specialized. */
#define SELECT 1
#define OBJECT_ACTIVE_MODIFIER_NONE -1
@@ -608,9 +608,9 @@ enum {
/* OB_DRAWIMAGE = 1 << 4, */ /* UNUSED */
/* for solid+wire display */
OB_DRAWWIRE = 1 << 5,
- /* for overdraw s*/
+ /* For overdrawing. */
OB_DRAW_IN_FRONT = 1 << 6,
- /* enable transparent draw */
+ /* Enable transparent draw. */
OB_DRAWTRANSP = 1 << 7,
OB_DRAW_ALL_EDGES = 1 << 8, /* only for meshes currently */
OB_DRAW_NO_SHADOW_CAST = 1 << 9,
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 0b07b8271a5..bb6b58e023d 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -699,7 +699,8 @@ typedef struct RenderData {
float frs_sec_base;
/**
- * Value used to define filter size for all filter options */
+ * Value used to define filter size for all filter options.
+ */
float gauss;
/* color management settings - color profiles, gamma correction, etc */
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index 84b80310918..01e3b3a5230 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -93,7 +93,7 @@ typedef struct BlurShaderFxData {
int flag;
/** Number of samples. */
int samples;
- /** Rotation of blur effect. */
+ /** Rotation of blur effect. */
float rotation;
char _pad[4];
@@ -149,7 +149,7 @@ typedef struct GlowShaderFxData {
int mode;
float blur[2];
int samples;
- /** Rotation of effect. */
+ /** Rotation of effect. */
float rotation;
/** Blend modes. */
int blend_mode;
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 0e673aaec66..fb2d985d353 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -78,9 +78,9 @@ typedef struct MovieTrackingCamera {
float nuke_k1, nuke_k2;
/* Brown-Conrady distortion model coefficients */
- /** Brown-Conrady radial distortion **/
+ /** Brown-Conrady radial distortion. */
float brown_k1, brown_k2, brown_k3, brown_k4;
- /** Brown-Conrady tangential distortion **/
+ /** Brown-Conrady tangential distortion. */
float brown_p1, brown_p2;
} MovieTrackingCamera;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 61d2c04d98b..98261dea232 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -1146,8 +1146,10 @@ typedef enum eAutokey_Mode {
/* AUTOKEY_ON is a bitflag */
AUTOKEY_ON = 1,
- /** AUTOKEY_ON + 2**n... (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2)
- * to preserve setting, even when autokey turned off */
+ /**
+ * AUTOKEY_ON + 2**n... (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2)
+ * to preserve setting, even when auto-key turned off.
+ */
AUTOKEY_MODE_NORMAL = 3,
AUTOKEY_MODE_EDITKEYS = 5,
} eAutokey_Mode;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 3b35b527584..80de5ae3b7c 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -548,7 +548,7 @@ enum {
V3D_OVERLAY_EDIT_INDICES = (1 << 19),
/* Deprecated. */
- /* V3D_OVERLAY_EDIT_CU_HANDLES = (1 << 20), */
+ // V3D_OVERLAY_EDIT_CU_HANDLES = (1 << 20),
V3D_OVERLAY_EDIT_CU_NORMALS = (1 << 21),
};
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index e6b4ae97355..91c9f3a9204 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -60,8 +60,8 @@
#define SDNA_MAX_FILENAME_LENGTH 255
-/* Included the path relative from /source/blender/ here, so we can move */
-/* headers around with more freedom. */
+/* Included the path relative from /source/blender/ here,
+ * so we can move headers around with more freedom. */
static const char *includefiles[] = {
/* if you add files here, please add them at the end
* of makesdna.c (this file) as well */
@@ -1227,17 +1227,17 @@ static int make_structDNA(const char *base_directory,
/* the defines above shouldn't be output in the padding file... */
const int firststruct = types_len;
- /* add all include files defined in the global array */
- /* Since the internal file+path name buffer has limited length, I do a */
- /* little test first... */
- /* Mind the breaking condition here! */
+ /* Add all include files defined in the global array.
+ * Since the internal file+path name buffer has limited length,
+ * I do a little test first...
+ * Mind the breaking condition here! */
DEBUG_PRINTF(0, "\tStart of header scan:\n");
int header_count = 0;
for (int i = 0; *(includefiles[i]) != '\0'; i++) {
header_count++;
- /* str contains filenames. Since we now include paths, I stretched */
- /* it a bit. Hope this is enough :) -nzc- */
+ /* NOTE(nzc): `str` contains filenames.
+ * Since we now include paths, I stretched it a bit. Hope this is enough :). */
char str[SDNA_MAX_FILENAME_LENGTH];
sprintf(str, "%s%s", base_directory, includefiles[i]);
DEBUG_PRINTF(0, "\t|-- Converting %s\n", str);