[Bf-blender-cvs] [898625547f8] sculpt-dev: Fix problem in last commit

Joseph Eagar noreply at git.blender.org
Mon Sep 20 12:14:55 CEST 2021


Commit: 898625547f8c15ae2bdf05fffc6904059d7b1498
Author: Joseph Eagar
Date:   Mon Sep 20 03:14:14 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB898625547f8c15ae2bdf05fffc6904059d7b1498

Fix problem in last commit

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

M	source/blender/blenkernel/intern/brush_engine_presets.c

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

diff --git a/source/blender/blenkernel/intern/brush_engine_presets.c b/source/blender/blenkernel/intern/brush_engine_presets.c
index 995c56ba240..10897d6307e 100644
--- a/source/blender/blenkernel/intern/brush_engine_presets.c
+++ b/source/blender/blenkernel/intern/brush_engine_presets.c
@@ -1014,17 +1014,15 @@ void BKE_brush_init_toolsettings(Sculpt *sd)
   }
 
   BKE_brush_check_toolsettings(sd);
+
+  namestack_pop();
 }
 
 void BKE_brush_check_toolsettings(Sculpt *sd)
 {
   namestack_push(__func__);
 
-  if (sd->channels) {
-    BKE_brush_channelset_free(sd->channels);
-  }
-
-  BrushChannelSet *chset = sd->channels = BKE_brush_channelset_create();
+  BrushChannelSet *chset = sd->channels;
 
   ADDCH("radius");
   ADDCH("strength");



More information about the Bf-blender-cvs mailing list