[Bf-blender-cvs] [32ceaa79191] temp_bmesh_multires: Update ATTR_NO_OPT macro

[Joseph Eagar]

Commit: 32ceaa7919181b4235fcd8f432a7171f88f076fa
Author: Joseph Eagar
Date:   Wed May 12 22:27:35 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB32ceaa7919181b4235fcd8f432a7171f88f076fa

Update ATTR_NO_OPT macro

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

M	source/blender/blenlib/BLI_compiler_attrs.h
M	source/blender/editors/sculpt_paint/sculpt_geodesic.c

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

diff --git a/source/blender/blenlib/BLI_compiler_attrs.h b/source/blender/blenlib/BLI_compiler_attrs.h
index df54d061db7..08b415fef96 100644
--- a/source/blender/blenlib/BLI_compiler_attrs.h
+++ b/source/blender/blenlib/BLI_compiler_attrs.h
@@ -101,13 +101,13 @@
 
 /* Disable optimization for a function (for debugging use only)*/
 #ifdef __clang__
-#define ATTR_NO_OPT __attribute__((optnone))
+#  define ATTR_NO_OPT __attribute__((optnone))
 #elif __MSC_VER
 #  define ATTR_NO_OPT __pragma(optimize("", off))
 #elif __GNUC__
-#define ATTR_NO_OPT _Pragma(optimize, "O0")
+#  define ATTR_NO_OPT __attribute__((optimize("O0")))
 #else
-#define ATTR_NO_OPT
+#  define ATTR_NO_OPT
 #endif
 
 /* Alignment directive */
diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
index 4a1cd5508f0..db9fd368584 100644
--- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c
+++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
@@ -216,7 +216,7 @@ static float fast_geodesic_distance_propagate_across_triangle(
           printf("%.7f : %.7f\n",
                  result*2.0,
                  geodesic_distance_propagate_across_triangle(v0, v1, v2, dist1, dist2));*/
-          return result*4.0;
+          return result * 4.0;
         }
       }
     }