[Bf-blender-cvs] [34a6952067c] master: Cleanup: compiler warnings

Campbell Barton noreply at git.blender.org
Sat Sep 17 07:39:38 CEST 2022


Commit: 34a6952067c55678ad3f20449c2f54187d44dd87
Author: Campbell Barton
Date:   Sat Sep 17 15:12:42 2022 +1000
Branches: master
https://developer.blender.org/rB34a6952067c55678ad3f20449c2f54187d44dd87

Cleanup: compiler warnings

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

M	source/blender/blenkernel/intern/paint.cc
M	source/blender/editors/sculpt_paint/sculpt_automasking.cc

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

diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index 27ab51f8f71..5dc8e3e0112 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -2422,10 +2422,10 @@ static bool sculpt_attribute_create(SculptSession *ss,
           "array "
           "instead.\n",
           __func__);
-      permanent = out->params.permanent = false;
+      permanent = (out->params.permanent = false);
     }
 
-    simple_array = out->params.simple_array = true;
+    simple_array = (out->params.simple_array = true);
   }
 
   BLI_assert(!(simple_array && permanent));
@@ -2791,11 +2791,6 @@ static void sculpt_attribute_update_refs(Object *ob)
   }
 }
 
-bool BKE_paint_uses_channels(ePaintMode mode)
-{
-  return mode == PAINT_MODE_SCULPT;
-}
-
 void BKE_sculpt_attribute_destroy_temporary_all(Object *ob)
 {
   SculptSession *ss = ob->sculpt;
diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
index 34d7a459c1b..f4da70faad7 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@ -256,9 +256,9 @@ static void sculpt_face_sets_automasking_init(Sculpt *sd, Object *ob)
 
 #define EDGE_DISTANCE_INF -1
 
-void SCULPT_boundary_automasking_init(Object *ob,
-                                      eBoundaryAutomaskMode mode,
-                                      int propagation_steps)
+static void SCULPT_boundary_automasking_init(Object *ob,
+                                             eBoundaryAutomaskMode mode,
+                                             int propagation_steps)
 {
   SculptSession *ss = ob->sculpt;



More information about the Bf-blender-cvs mailing list