Commit: 8e46e5189d511d3e4495fe5bf4f122536963ae7e
Author: Campbell Barton
Date: Tue Jan 15 23:14:35 2019 +1100
Branches: blender2.7
https://developer.blender.org/rB8e46e5189d511d3e4495fe5bf4f122536963ae7e
Cleanup: comment line length (DNA)
Prevents clang-format wrapping text before comments.
===================================================================
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_armature_types.h
M source/blender/makesdna/DNA_boid_types.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_genfile.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_fluidsim_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view2d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesdna/intern/makesdna.c
===================================================================
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index e9bc0f41980..df8ac92eb86 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -267,13 +267,13 @@ typedef enum ID_Type {
/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
#define ID_SEQ MAKE_ID2('S', 'Q')
- /* constraint */
+/* constraint */
#define ID_CO MAKE_ID2('C', 'O')
- /* pose (action channel, used to be ID_AC in code, so
we keep code for backwards compat) */
+/* pose (action channel, used to be ID_AC in code, so we keep code for
backwards compat) */
#define ID_PO MAKE_ID2('A', 'C')
- /* used in outliner... */
+/* used in outliner... */
#define ID_NLA MAKE_ID2('N', 'L')
- /* fluidsim Ipo */
+/* fluidsim Ipo */
#define ID_FLUIDSIM MAKE_ID2('F', 'S')
#define ID_FAKE_USERS(id) ((((ID *)id)->flag & LIB_FAKEUSER) ? 1 : 0)
@@ -308,31 +308,38 @@ enum {
*
* Those flags belong to three different categories, which have different
expected handling in code:
*
- * - RESET_BEFORE_USE: piece of code that wants to use such flag has to
ensure they are properly 'reset' first.
- * - RESET_AFTER_USE: piece of code that wants to use such flag has to
ensure they are properly 'reset' after usage
- * (though 'lifetime' of those flags is a bit fuzzy, e.g.
_RECALC ones are reset on depsgraph
- * evaluation...).
- * - RESET_NEVER: those flags are 'status' one, and never actually need any
reset (except on initialization
- * during .blend file reading).
+ * - RESET_BEFORE_USE: piece of code that wants to use such flag
+ * has to ensure they are properly 'reset' first.
+ * - RESET_AFTER_USE: piece of code that wants to use such flag has to ensure
they are properly
+ * 'reset' after usage
+ * (though 'lifetime' of those flags is a bit fuzzy, e.g. _RECALC ones are
reset on depsgraph
+ * evaluation...).
+ * - RESET_NEVER: those flags are 'status' one, and never actually need any
reset
+ * (except on initialization during .blend file reading).
*/
enum {
/* RESET_NEVER Datablock is from current .blend file. */
LIB_TAG_LOCAL = 0,
- /* RESET_NEVER Datablock is from a library, but is used (linked)
directly by current .blend file. */
+ /* RESET_NEVER Datablock is from a library,
+ * but is used (linked) directly by current .blend file. */
LIB_TAG_EXTERN = 1 << 0,
- /* RESET_NEVER Datablock is from a library, and is only used (linked)
inderectly through other libraries. */
+ /* RESET_NEVER Datablock is from a library,
+ * and is only used (linked) inderectly through other libraries. */
LIB_TAG_INDIRECT = 1 << 1,
- /* RESET_AFTER_USE Three flags used internally in readfile.c, to mark
IDs needing to be read (only done once). */
+ /* RESET_AFTER_USE Three flags used internally in readfile.c,
+ * to mark IDs needing to be read (only done once). */
LIB_TAG_NEED_EXPAND = 1 << 3,
LIB_TAG_TESTEXT = (LIB_TAG_NEED_EXPAND | LIB_TAG_EXTERN),
LIB_TAG_TESTIND = (LIB_TAG_NEED_EXPAND | LIB_TAG_INDIRECT),
- /* RESET_AFTER_USE Flag used internally in readfile.c, to mark IDs
needing to be linked from a library. */
+ /* RESET_AFTER_USE Flag used internally in readfile.c,
+ * to mark IDs needing to be linked from a library. */
LIB_TAG_READ = 1 << 4,
/* RESET_AFTER_USE */
LIB_TAG_NEED_LINK = 1 << 5,
- /* RESET_NEVER tag datablock as a place-holder (because the real one
could not be linked from its library e.g.). */
+ /* RESET_NEVER tag datablock as a place-holder
+ * (because the real one could not be linked from its library e.g.). */
LIB_TAG_MISSING = 1 << 6,
/* tag datablock has having an extra user. */
diff --git a/source/blender/makesdna/DNA_action_types.h
b/source/blender/makesdna/DNA_action_types.h
index aa39d53e62b..f74ee0b05a6 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -172,11 +172,12 @@ typedef enum eMotionPaths_ViewFlag {
/* bAnimVizSettings->path_bakeflag */
typedef enum eMotionPaths_BakeFlag {
- /* motion paths directly associated with this block of settings needs
updating */
+ /** motion paths directly associated with this block of settings needs
updating */
MOTIONPATH_BAKE_NEEDS_RECALC = (1 << 0),
- /* for bones - calculate head-points for curves instead of tips */
+ /** for bones - calculate head-points for curves instead of tips */
MOTIONPATH_BAKE_HEADS = (1 << 1),
- /* motion paths exist for AnimVizSettings instance - set when calc for
first time, and unset when clearing */
+ /** motion paths exist for AnimVizSettings instance - set when calc for
first time,
+ * and unset when clearing */
MOTIONPATH_BAKE_HAS_PATHS = (1 << 2)
} eMotionPath_BakeFlag;
@@ -587,12 +588,16 @@ typedef struct bDopeSheet {
/* DopeSheet filter-flag */
typedef enum eDopeSheet_FilterFlag {
/* general filtering */
- ADS_FILTER_ONLYSEL = (1 << 0), /* only include channels
relating to selected data */
+ /** only include channels relating to selected data */
+ ADS_FILTER_ONLYSEL = (1 << 0),
/* temporary filters */
- ADS_FILTER_ONLYDRIVERS = (1 << 1), /* for 'Drivers' editor -
only include Driver data from AnimData */
- ADS_FILTER_ONLYNLA = (1 << 2), /* for 'NLA' editor - only
include NLA data from AnimData */
- ADS_FILTER_SELEDIT = (1 << 3), /* for Graph Editor - used to
indicate whether to include a filtering flag or not */
+ /** for 'Drivers' editor - only include Driver data from AnimData */
+ ADS_FILTER_ONLYDRIVERS = (1 << 1),
+ /** for 'NLA' editor - only include NLA data from AnimData */
+ ADS_FILTER_ONLYNLA = (1 << 2),
+ /** for Graph Editor - used to indicate whether to include a filtering
flag or not */
+ ADS_FILTER_SELEDIT = (1 << 3),
/* general filtering */
ADS_FILTER_SUMMARY = (1 << 4), /* for 'DopeSheet' Editors -
include 'summary' line */
@@ -601,7 +606,8 @@ typedef enum eDopeSheet_FilterFlag {
/* datatype-based filtering */
ADS_FILTER_NOSHAPEKEYS = (1 << 6),
ADS_FILTER_NOMESH = (1 << 7),
- ADS_FILTER_NOOBJ = (1 << 8), /* for animdata on object
level, if we only want to concentrate on materials/etc. */
+ /** for animdata on object level, if we only want to concentrate on
materials/etc. */
+ ADS_FILTER_NOOBJ = (1 << 8),
ADS_FILTER_NOLAT = (1 << 9),
ADS_FILTER_NOCAM = (1 << 10),
ADS_FILTER_NOMAT = (1 << 11),
@@ -621,7 +627,8 @@ typedef enum eDopeSheet_FilterFlag {
/* NOTE: all new datablock filters will have to go in filterflag2 (see
below) */
/* NLA-specific filters */
- ADS_FILTER_NLA_NOACT = (1 << 25), /* if the AnimData block has
no NLA data, don't include to just show Action-line */
+ /** if the AnimData block has no NLA data, don't include to just show
Action-line */
+ ADS_FILTER_NLA_NOACT = (1 << 25),
/* general filtering 3 */
ADS_FILTER_INCL_HIDDEN = (1 << 26), /* include 'hidden' channels
too (i.e. those from hidden Objects/Bones) */
@@ -629,19 +636,25 @@ typedef enum eDopeSheet_FilterFlag {
ADS_FILTER_ONLY_ERRORS = (1 << 28), /* show only F-Curves
which are disabled/have errors - for debugging drivers */
/* GPencil Mode */
- ADS_FILTER_GP_3DONLY = (1 << 29), /* GP Mode - Only show
datablocks used in the scene */
+ /** GP Mode - Only show datablocks used in the scene */
+ ADS_FILTER_GP_3DONLY = (1 << 29),
- /* combination filters (some only used at runtime) */
+ /** combination filters (some only used at runtime) */
ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT |
ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM |
ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS)
} eDopeSheet_FilterFlag;
/* DopeSheet general flags */
typedef enum eDopeSheet_Flag {
- ADS_FLAG_SUMMARY_COLLAPSED = (1 << 0), /* when summary is shown, it
is collapsed, so all other channels get hidden */
- ADS_FLAG_SHOW_DBFILTERS = (1 << 1), /* show filters for
datablocks */
-
- ADS_FLAG_FUZZY_NAMES = (1 << 2), /* use fuzzy/partial string
matches when ADS_FILTER_BY_FCU_NAME is enabled (WARNING: expensive operation) */
- ADS_FLAG_NO_DB_SORT = (1 << 3), /* do not sort datablocks
(mostly objects) by name (NOTE: potentially expensive operation) */
+ /** when summary is shown, it is collapsed, so all other channels get
hidden */
+ ADS_FLAG_SUMMARY_COLLAPSED = (1 << 0),
+ /** show filters for datablocks */
+ ADS_FLAG_SHOW_DBFILTERS = (1 << 1),
+
+ /** use fuzzy/partial string matches when ADS_FILTER_BY_FCU_NAME is
enabled
+ * (WARNING: expensive operation) */
+ ADS_FLAG_FUZZY_NAMES = (1 << 2),
+ /** do not sort datablocks (mostly objects) by name (NOTE: potentially
expensive operation) */
+ ADS_FLAG_NO_DB_SORT = (1 << 3),
/* NOTE: datablock filter flags continued (1 << 10) onwards... */
} eDopeSheet_Flag;
diff --git a/source/blender/makesdna/DNA_anim_types.h
b/source/blender/makesdna/DNA_anim_types.h
index 5119c06f927..8f48ed6d3ca 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -77,7 +77,8 @@ typedef enum eFModifier_Types {
FMODIFIER_TYPE_ENVELOPE = 3,
FMODIFIER_TYPE_CYCLES = 4,
FMODIFIER_TYPE_NOISE = 5,
- FMODIFIER_TYPE_FILTER = 6, /* unimplemented - for
applying: fft, high/low pass filters, etc. */
+ /** unimplemented - for applying: fft, high/low pass filters, etc. */
+ FMODIFIER_TYPE_FILTER = 6,
FMODIFIER_TYPE_PYTHON = 7,
FMODIFIER_TYPE_LIMITS = 8,
FMODIFIER_TYPE_STEPPED = 9,
@@ -194,10 +195,14 @@ typedef struct FMod_Cycles {
/* cycling modes */
typedef enum eFMod_Cycling_Modes {
- FCM_EXTRAPOLATE_NONE = 0, /* don't do anything */
- FCM_EXTRAPOLATE_CYCLIC, /* repeat keyframe
range as-is */
- FCM_EXTRAPOLATE_CYCLIC_OFFSET, /* repeat keyframe range, but
with offset based on gradient between values */
- FCM_EXTRAPOLATE_MIRROR /* alternate between
forward and reverse playback of keyframe range */
+ /** don't do anything */
+ FCM_EXTRAPOLATE_NONE = 0,
+ /** repeat keyframe range as-is */
+ FCM_EXT
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
