[Bf-blender-cvs] [db5d9ddb1ab] master: Cleanup: use `e` prefix for enum, comment on misleading flag values
Campbell Barton
noreply at git.blender.org
Tue Mar 23 03:30:25 CET 2021
Commit: db5d9ddb1abdfb45548ea60b7c19687fc68dd2c9
Author: Campbell Barton
Date: Tue Mar 23 13:22:54 2021 +1100
Branches: master
https://developer.blender.org/rBdb5d9ddb1abdfb45548ea60b7c19687fc68dd2c9
Cleanup: use `e` prefix for enum, comment on misleading flag values
Also replace "Feature" with "LineArt" in enum names.
===================================================================
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index f5fcb0b190e..aa91699ae40 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -46,7 +46,10 @@ typedef struct CollectionChild {
struct Collection *collection;
} CollectionChild;
-enum CollectionFeatureLine_Usage {
+/**
+ * \warning while the values seem to be flags, they aren't treated as flags.
+ */
+enum eCollectionLineArt_Usage {
COLLECTION_LRT_INCLUDE = 0,
COLLECTION_LRT_OCCLUSION_ONLY = (1 << 0),
COLLECTION_LRT_EXCLUDE = (1 << 1),
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index aa0768d1eed..686cf2048eb 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -213,7 +213,10 @@ typedef struct ObjectLineArt {
float crease_threshold;
} ObjectLineArt;
-enum ObjectFeatureLine_Usage {
+/**
+ * \warning while the values seem to be flags, they aren't treated as flags.
+ */
+enum eObjectLineArt_Usage {
OBJECT_LRT_INHERIT = 0,
OBJECT_LRT_INCLUDE = (1 << 0),
OBJECT_LRT_OCCLUSION_ONLY = (1 << 1),
@@ -222,7 +225,7 @@ enum ObjectFeatureLine_Usage {
OBJECT_LRT_NO_INTERSECTION = (1 << 4),
};
-enum ObjectFeatureLine_Flags {
+enum eObjectLineArt_Flags {
OBJECT_LRT_OWN_CREASE = (1 << 0),
};
More information about the Bf-blender-cvs
mailing list