[Bf-blender-cvs] [28b7b1c3d8e] temp-sculpt-cavity-mask: temp-sculpt-cavity-mask: Fix compile error

Joseph Eagar noreply at git.blender.org
Wed Jun 8 12:48:25 CEST 2022


Commit: 28b7b1c3d8e161db38ba08a115a01869582d0c94
Author: Joseph Eagar
Date:   Wed Jun 8 03:48:14 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rB28b7b1c3d8e161db38ba08a115a01869582d0c94

temp-sculpt-cavity-mask: Fix compile error

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

M	source/blender/editors/sculpt_paint/sculpt_automasking.cc

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
index b2ff961a89e..ea0684fedff 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@ -161,8 +161,8 @@ float SCULPT_calc_cavity(SculptSession *ss, const int vertex)
 }
 
 static float sculpt_automasking_cavity_factor_intern(SculptSession *ss,
-                                                                 AutomaskingCache *automasking,
-                                                                 int vert)
+                                                     AutomaskingCache *automasking,
+                                                     int vert)
 {
   float factor = SCULPT_calc_cavity(ss, vert);
   float sign = signf(factor);
@@ -197,10 +197,10 @@ struct CavityBlurVert {
   }
 };
 
-ATTR_NO_OPT static void sculpt_calc_blurred_cavity(SculptSession *ss,
-                                                   AutomaskingCache *automasking,
-                                                   int steps,
-                                                   int vertex)
+static void sculpt_calc_blurred_cavity(SculptSession *ss,
+                                       AutomaskingCache *automasking,
+                                       int steps,
+                                       int vertex)
 {
   if (steps == 0) {
     ss->cavity_factor[vertex] = sculpt_automasking_cavity_factor_intern(ss, automasking, vertex);
@@ -285,9 +285,9 @@ ATTR_NO_OPT static void sculpt_calc_blurred_cavity(SculptSession *ss,
   ss->cavity_stroke_id[vertex] = ss->stroke_id;
 }
 
-ATTR_NO_OPT static float sculpt_automasking_cavity_factor(AutomaskingCache *automasking,
-                                                          SculptSession *ss,
-                                                          int vertex)
+static float sculpt_automasking_cavity_factor(AutomaskingCache *automasking,
+                                              SculptSession *ss,
+                                              int vertex)
 {
   if (ss->cavity_stroke_id[vertex] != ss->stroke_id) {
     sculpt_calc_blurred_cavity(ss, automasking, automasking->settings.cavity_blur_steps, vertex);



More information about the Bf-blender-cvs mailing list