[Bf-blender-cvs] [024d40b504e] master: Cleanup: comments (long lines) in makesrna
Campbell Barton
noreply at git.blender.org
Sun Apr 21 22:35:20 CEST 2019
Commit: 024d40b504e4dc2a23824021bdcfe772a1f5f670
Author: Campbell Barton
Date: Mon Apr 22 02:48:05 2019 +1000
Branches: master
https://developer.blender.org/rB024d40b504e4dc2a23824021bdcfe772a1f5f670
Cleanup: comments (long lines) in makesrna
===================================================================
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_define.h
M source/blender/makesrna/RNA_documentation.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_animviz.c
M source/blender/makesrna/intern/rna_armature.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_define.c
M source/blender/makesrna/intern/rna_depsgraph.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_fcurve_api.c
M source/blender/makesrna/intern/rna_fluidsim.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_internal_types.h
M source/blender/makesrna/intern/rna_key.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_nla.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_texture.c
M source/blender/makesrna/intern/rna_ui.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/makesrna/intern/rna_wm_gizmo.c
===================================================================
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 33ff3f43c07..a7b111d49da 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -1409,7 +1409,8 @@ void _RNA_warning(const char *format, ...) ATTR_PRINTF_FORMAT(1, 2);
/* Equals test. */
-/* Note: In practice, EQ_STRICT and EQ_COMPARE have same behavior currently, and will yield same result. */
+/* Note: In practice, EQ_STRICT and EQ_COMPARE have same behavior currently,
+ * and will yield same result. */
typedef enum eRNACompareMode {
/* Only care about equality, not full comparison. */
RNA_EQ_STRICT, /* set/unset ignored */
@@ -1445,7 +1446,8 @@ typedef enum eRNAOverrideMatch {
} eRNAOverrideMatch;
typedef enum eRNAOverrideMatchResult {
- /* Some new property overrides were created to take into account differences between local and reference. */
+ /* Some new property overrides were created to take into account
+ * differences between local and reference. */
RNA_OVERRIDE_MATCH_RESULT_CREATED = 1 << 0,
/* Some properties were reset to reference values. */
RNA_OVERRIDE_MATCH_RESULT_RESTORED = 1 << 1,
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h
index 706f1ca9e84..59c03cf34b3 100644
--- a/source/blender/makesrna/RNA_define.h
+++ b/source/blender/makesrna/RNA_define.h
@@ -262,8 +262,18 @@ PropertyRNA *RNA_def_float_array(StructOrFunctionRNA *cont,
float softmin,
float softmax);
-//PropertyRNA *RNA_def_float_dynamic_array(StructOrFunctionRNA *cont, const char *identifier, float hardmin, float hardmax,
-// const char *ui_name, const char *ui_description, float softmin, float softmax, unsigned int dimension, unsigned short dim_size[]);
+#if 0
+PropertyRNA *RNA_def_float_dynamic_array(StructOrFunctionRNA *cont,
+ const char *identifier,
+ float hardmin,
+ float hardmax,
+ const char *ui_name,
+ const char *ui_description,
+ float softmin,
+ float softmax,
+ unsigned int dimension,
+ unsigned short dim_size[]);
+#endif
PropertyRNA *RNA_def_float_percentage(StructOrFunctionRNA *cont,
const char *identifier,
diff --git a/source/blender/makesrna/RNA_documentation.h b/source/blender/makesrna/RNA_documentation.h
index 7999c45f758..cf1cf5fa50e 100644
--- a/source/blender/makesrna/RNA_documentation.h
+++ b/source/blender/makesrna/RNA_documentation.h
@@ -18,5 +18,6 @@
* \ingroup RNA
* \page makesrna makesrna
* \section aboutmakesrna About RNA
- * The \ref RNA module defines and provides the access API to the data, thus encapsulating \ref DNA
+ * The \ref RNA module defines and provides the access API to the data,
+ * thus encapsulating \ref DNA
*/
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 95d3aee634f..463d612094e 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -248,7 +248,12 @@ const EnumPropertyItem *RNA_action_itemf(struct bContext *C,
struct PointerRNA *ptr,
struct PropertyRNA *prop,
bool *r_free);
-// EnumPropertyItem *RNA_action_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free);
+#if 0
+EnumPropertyItem *RNA_action_local_itemf(struct bContext *C,
+ struct PointerRNA *ptr,
+ struct PropertyRNA *prop,
+ bool *r_free);
+#endif
const EnumPropertyItem *RNA_collection_itemf(struct bContext *C,
struct PointerRNA *ptr,
struct PropertyRNA *prop,
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 961b4b23073..1cc7d772ecc 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -201,19 +201,25 @@ typedef enum PropertyFlag {
* only apply this to types that are derived from an ID ()*/
PROP_ID_SELF_CHECK = (1 << 20),
/* use for...
- * - pointers: in the UI and python so unsetting or setting to None won't work
- * - strings: so our internal generated get/length/set functions know to do NULL checks before access [#30865] */
+ * - pointers: in the UI and python so unsetting or setting to None won't work.
+ * - strings: so our internal generated get/length/set
+ * functions know to do NULL checks before access T30865.
+ */
PROP_NEVER_NULL = (1 << 18),
/* currently only used for UI, this is similar to PROP_NEVER_NULL
* except that the value may be NULL at times, used for ObData, where an Empty's will be NULL
- * but setting NULL on a mesh object is not possible. So, if its not NULL, setting NULL cant be done! */
+ * but setting NULL on a mesh object is not possible.
+ * So, if its not NULL, setting NULL cant be done!
+ */
PROP_NEVER_UNLINK = (1 << 25),
/* Pointers to data that is not owned by the struct.
* Typical example: Bone.parent, Bone.child, etc., and nearly all ID pointers.
- * This is crucial information for processes that walk the whole data of an ID e.g. (like static override).
- * Note that all ID pointers are enforced to this by default, this probably will need to be rechecked
- * (see ugly infamous NodeTrees of mat/tex/scene/etc.). */
+ * This is crucial information for processes that walk the whole data of an ID e.g.
+ * (like static override).
+ * Note that all ID pointers are enforced to this by default,
+ * this probably will need to be rechecked (see ugly infamous NodeTrees of mat/tex/scene/etc.).
+ */
PROP_PTR_NO_OWNERSHIP = (1 << 7),
/* flag contains multiple enums.
@@ -248,7 +254,8 @@ typedef enum PropertyFlag {
PROP_NO_DEG_UPDATE = (1 << 30),
} PropertyFlag;
-/* Flags related to comparing and overriding RNA properties. Make sure enums are updated with these */
+/* Flags related to comparing and overriding RNA properties.
+ * Make sure enums are updated with these */
/* FREE FLAGS: 2, 3, 4, 5, 6, 7, 8, 9, 12 and above. */
typedef enum PropertyOverrideFlag {
/* Means the property can be overridden by a local 'proxy' of some linked datablock. */
@@ -275,7 +282,8 @@ typedef enum ParameterFlag {
PARM_REQUIRED = (1 << 0),
PARM_OUTPUT = (1 << 1),
PARM_RNAPTR = (1 << 2),
- /* This allows for non-breaking API updates, when adding non-critical new parameter to a callback function.
+ /* This allows for non-breaking API updates,
+ * when adding non-critical new parameter to a callback function.
* This way, old py code defining funcs without that parameter would still work.
* WARNING: any parameter after the first PYFUNC_OPTIONAL one will be considered as optional!
* NOTE: only for input parameters!
@@ -295,16 +303,20 @@ typedef struct ListBaseIterator {
typedef struct ArrayIterator {
char *ptr;
- char *endptr; /* past the last valid pointer, only for comparisons, ignores skipped values */
- void *free_ptr; /* will be freed if set */
+ /* Past the last valid pointer, only for comparisons, ignores skipped values. */
+ char *endptr;
+ /* Will be freed if set. */
+ void *free_ptr;
int itemsize;
- /* array length with no skip functions applied, take care not to compare against index from animsys
- * or python indices */
+ /* Array length with no skip functions applied,
+ * take care not to compare against index from animsys or python indices. */
int length;
- /* optional skip function, when set the array as viewed by rna can contain only a subset of the members.
- * this changes indices so quick array index lookups are not possible when skip function is used. */
+ /* Optional skip function,
+ * when set the array as viewed by rna can contain only a subset of the members.
+ * this changes indices so quick array index lookups are not possible when skip function is used.
+ */
IteratorSkipFunc skip;
} ArrayIterator;
@@ -476,10 +488,12 @@ typedef enum FunctionFlag {
* [ReportList *reports],
* <other RNA-defined parameters>);
*/
- /* Pass ID owning 'self' data (i.e. ptr->id.data, might be same as self in case data is an ID...). */
+ /* Pass ID owning 'self' data
+ * (i.e. ptr->id.data, might be same as self in case data is an ID...). */
FUNC_USE_SELF_ID = (1 << 11),
- /* Do not pass the object (DNA struct pointer) from which it is called, used to define static or class functions. */
+ /* Do not pass the object (DNA struct pointer) from which it is called,
+ * used to define static or class functions. */
FUNC_NO_SELF = (1 << 0),
/* Pass RNA type, used to define class functions, only valid when FUNC_NO_SELF is set. */
FUNC_USE_SELF_TYPE = (1 << 1),
@@ -490,11 +504,13 @@ typedef enum FunctionFlag {
FUNC_USE_REPORTS = (1 << 4),
/***** Registering of python subclasses. *****/
- /* This function is part of the registerable class' interface, and can be implemented/redefined in python. */
+ /* This function is part of the registerable class' interface,
+ * and can be implemented/redefined in python. */
FUNC_REGISTER = (1 << 5),
/* Subclasses can choose not to implement this function. */
FUNC_REGISTER_OPTIONAL = FUNC_REGISTER | (1 << 6),
- /* If not set, the python function implementing this call is not allowed to write into data-blocks.
+ /* If not set, the python function implementing this call
+ * is not allowed to write into data-blocks.
* Except for WindowManager and Screen currently, see rna_id_write_error() in bpy_rna.c */
FUNC_ALLOW_WRITE = (1 << 12),
@@ -505,7 +
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list