[Bf-blender-cvs] [122fefcc858] master: DNA: add defaults for UnifiedPaintSettings

[Siddhartha Jejurkar]

Commit: 122fefcc8589a09d4e89ed3045f29f07ec6564e9
Author: Siddhartha Jejurkar
Date:   Wed Mar 10 21:41:55 2021 +1100
Branches: master
https://developer.blender.org/rB122fefcc8589a09d4e89ed3045f29f07ec6564e9

DNA: add defaults for UnifiedPaintSettings

Newly created scenes had unified paint settings zeroed. see T80164

Ref D10658

===================================================================

M	source/blender/makesdna/DNA_scene_defaults.h
M	source/blender/makesdna/intern/dna_defaults.c
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h
index 3e1b2ef56a1..1a2a8892e64 100644
--- a/source/blender/makesdna/DNA_scene_defaults.h
+++ b/source/blender/makesdna/DNA_scene_defaults.h
@@ -284,6 +284,15 @@
     .count = 10, \
   }
 
+#define _DNA_DEFAULTS_UnifiedPaintSettings \
+  { \
+    .size = 50, \
+    .unprojected_radius = 0.29, \
+    .alpha = 0.5f, \
+    .weight = 0.5f, \
+    .flag = UNIFIED_PAINT_SIZE | UNIFIED_PAINT_ALPHA, \
+  }
+
 #define _DNA_DEFAULTS_ParticleEditSettings \
   { \
     .flag = PE_KEEP_LENGTHS | PE_LOCK_FIRST | PE_DEFLECT_EMITTER | PE_AUTO_VELOCITY, \
@@ -345,6 +354,8 @@
     .snap_transform_mode_flag = SCE_SNAP_TRANSFORM_MODE_TRANSLATE, \
  \
     .curve_paint_settings = _DNA_DEFAULTS_CurvePaintSettings, \
+ \
+    .unified_paint_settings = _DNA_DEFAULTS_UnifiedPaintSettings, \
  \
     .statvis = _DNA_DEFAULTS_MeshStatVis, \
  \
diff --git a/source/blender/makesdna/intern/dna_defaults.c b/source/blender/makesdna/intern/dna_defaults.c
index 3e4d5d87fb0..7aca742a8e6 100644
--- a/source/blender/makesdna/intern/dna_defaults.c
+++ b/source/blender/makesdna/intern/dna_defaults.c
@@ -425,6 +425,7 @@ const void *DNA_default_table[SDNA_TYPE_MAX] = {
     SDNA_DEFAULT_DECL(ToolSettings),
     SDNA_DEFAULT_DECL_EX(CurvePaintSettings, ToolSettings.curve_paint_settings),
     SDNA_DEFAULT_DECL_EX(ImagePaintSettings, ToolSettings.imapaint),
+    SDNA_DEFAULT_DECL_EX(UnifiedPaintSettings, ToolSettings.unified_paint_settings),
     SDNA_DEFAULT_DECL_EX(ParticleEditSettings, ToolSettings.particle),
     SDNA_DEFAULT_DECL_EX(ParticleBrushData, ToolSettings.particle.brush[0]),
     SDNA_DEFAULT_DECL_EX(MeshStatVis, ToolSettings.statvis),
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 1ac224b27e4..4ff9e3006b4 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3569,7 +3569,6 @@ static void rna_def_unified_paint_settings(BlenderRNA *brna)
   prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, NULL, "alpha");
   RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
-  RNA_def_property_float_default(prop, 0.5f);
   RNA_def_property_range(prop, 0.0f, 10.0f);
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3);
   RNA_def_property_ui_text(
@@ -3579,7 +3578,6 @@ static void rna_def_unified_paint_settings(BlenderRNA *brna)
   prop = RNA_def_property(srna, "weight", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, NULL, "weight");
   RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
-  RNA_def_property_float_default(prop, 0.5f);
   RNA_def_property_range(prop, 0.0f, 1.0f);
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3);
   RNA_def_property_ui_text(prop, "Weight", "Weight to assign in vertex groups");