[Bf-blender-cvs] [328a0f975be] master: Cleanup: comment line length (DNA)
Campbell Barton
noreply at git.blender.org
Tue Jan 15 13:32:52 CET 2019
Commit: 328a0f975be68404604ee2571c1d0c4cf828dfec
Author: Campbell Barton
Date: Tue Jan 15 23:14:35 2019 +1100
Branches: master
https://developer.blender.org/rB328a0f975be68404604ee2571c1d0c4cf828dfec
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_color_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_ipo_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_mesh_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_object_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_smoke_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_tracking_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view2d_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_workspace_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 d373a1542c6..ba8365993c8 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -133,11 +133,13 @@ enum {
/*->flag*/
enum {
- /* This IDProp may be statically overridden. Should only be used/be relevant for custom properties. */
+ /** This IDProp may be statically overridden.
+ * Should only be used/be relevant for custom properties. */
IDP_FLAG_OVERRIDABLE_STATIC = 1 << 0,
- IDP_FLAG_GHOST = 1 << 7, /* this means the property is set but RNA will return false when checking
- * 'RNA_property_is_set', currently this is a runtime flag */
+ /** This means the property is set but RNA will return false when checking
+ * 'RNA_property_is_set', currently this is a runtime flag */
+ IDP_FLAG_GHOST = 1 << 7,
};
/* add any future new id property types here.*/
@@ -186,8 +188,10 @@ enum {
/* IDOverridePropertyOperation->flag. */
enum {
- IDOVERRIDESTATIC_FLAG_MANDATORY = 1 << 0, /* User cannot remove that override operation. */
- IDOVERRIDESTATIC_FLAG_LOCKED = 1 << 1, /* User cannot change that override operation. */
+ /** User cannot remove that override operation. */
+ IDOVERRIDESTATIC_FLAG_MANDATORY = 1 << 0,
+ /** User cannot change that override operation. */
+ IDOVERRIDESTATIC_FLAG_LOCKED = 1 << 1,
};
/** A single overridden property, contain all operations on this one. */
@@ -408,13 +412,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)
@@ -464,31 +468,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,
/* RESET_NEVER tag datablock as being up-to-date regarding its reference. */
@@ -515,7 +526,8 @@ enum {
LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT = 1 << 13,
LIB_TAG_LOCALIZED = 1 << 14,
- /* RESET_NEVER tag datablock for freeing etc. behavior (usually set when copying real one into temp/runtime one). */
+ /* RESET_NEVER tag datablock for freeing etc. behavior
+ * (usually set when copying real one into temp/runtime one). */
LIB_TAG_NO_MAIN = 1 << 15, /* Datablock is not listed in Main database. */
LIB_TAG_NO_USER_REFCOUNT = 1 << 16, /* Datablock does not refcount usages of other IDs. */
/* Datablock was not allocated by standard system (BKE_libblock_alloc), do not free its memory
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index c328aedecb6..c9c86e13202 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -200,11 +200,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;
@@ -746,20 +747,26 @@ 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 */
+ /** for 'DopeSheet' Editors - include 'summary' line */
+ ADS_FILTER_SUMMARY = (1 << 4),
/* 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),
@@ -779,26 +786,35 @@ 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) */
- ADS_FILTER_ONLY_ERRORS = (1 << 28), /* show only F-Curves which are disabled/have errors - for debugging drivers */
+ /** include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
+ ADS_FILTER_INCL_HIDDEN = (1 << 26),
+ /** show only F-Curves which are disabled/have errors - for debugging drivers */
+ ADS_FILTER_ONLY_ERRORS = (1 << 28),
/* 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 c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list