Merge branch 'property-search-add-theme-color' into property-search-single-tab

2 files changed, 10 insertions, 4 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a9f1d5bcfc4..9a5b5b8c2ca 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -861,26 +861,32 @@ typedef struct BooleanModifierData {
   ModifierData modifier;
 
   struct Object *object;
+  struct Collection *collection;
+  float double_threshold;
   char operation;
   char solver;
   char flag;
   char bm_flag;
-  float double_threshold;
 } BooleanModifierData;
 
+/* BooleanModifierData->operation */
 typedef enum {
   eBooleanModifierOp_Intersect = 0,
   eBooleanModifierOp_Union = 1,
   eBooleanModifierOp_Difference = 2,
 } BooleanModifierOp;
 
+/* BooleanModifierData->solver */
 typedef enum {
   eBooleanModifierSolver_Fast = 0,
   eBooleanModifierSolver_Exact = 1,
 } BooleanModifierSolver;
 
+/* BooleanModifierData->flag */
 enum {
   eBooleanModifierFlag_Self = (1 << 0),
+  eBooleanModifierFlag_Object = (1 << 1),
+  eBooleanModifierFlag_Collection = (1 << 2),
 };
 
 /* bm_flag only used when G_DEBUG. */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 29e29961028..f5a35783dca 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -420,10 +420,10 @@ static int add_name(const char *str)
   }
 
   if (str[0] == '(' && str[1] == '*') {
-    /* we handle function pointer and special array cases here, e.g.
-     * void (*function)(...) and float (*array)[..]. the array case
+    /* We handle function pointer and special array cases here, e.g.
+     * `void (*function)(...)` and `float (*array)[..]`. the array case
      * name is still converted to (array *)() though because it is that
-     * way in old dna too, and works correct with elementsize() */
+     * way in old DNA too, and works correct with #DNA_elem_size_nr. */
     int isfuncptr = (strchr(str + 1, '(')) != NULL;
 
     DEBUG_PRINTF(3, "\t\t\t\t*** Function pointer or multidim array pointer found\n");