[Bf-blender-cvs] [e812512e1d1] blender-v2.83-release: Cleanup: clang-format, unused warning

[Campbell Barton]

Commit: e812512e1d15125f5fc13aea27c173cde3a06470
Author: Campbell Barton
Date:   Thu Apr 23 12:10:41 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBe812512e1d15125f5fc13aea27c173cde3a06470

Cleanup: clang-format, unused warning

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

M	intern/cycles/util/util_avxb.h
M	intern/cycles/util/util_avxi.h
M	intern/cycles/util/util_ssei.h
M	source/blender/editors/uvedit/uvedit_ops.c
M	source/blender/makesrna/intern/rna_fluid.c

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

diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h
index 34fafd188de..5c03b1d88d7 100644
--- a/intern/cycles/util/util_avxb.h
+++ b/intern/cycles/util/util_avxb.h
@@ -57,7 +57,7 @@ struct avxb {
       : m256(_mm256_insertf128_ps(_mm256_castps128_ps256(a), b, 1))
   {
   }
-  __forceinline operator const __m256 &(void)const
+  __forceinline operator const __m256 &(void) const
   {
     return m256;
   }
diff --git a/intern/cycles/util/util_avxi.h b/intern/cycles/util/util_avxi.h
index e658a4f848f..1b3810764b7 100644
--- a/intern/cycles/util/util_avxi.h
+++ b/intern/cycles/util/util_avxi.h
@@ -54,7 +54,7 @@ struct avxi {
   __forceinline avxi(const __m256i a) : m256(a)
   {
   }
-  __forceinline operator const __m256i &(void)const
+  __forceinline operator const __m256i &(void) const
   {
     return m256;
   }
diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/util_ssei.h
index e2bf81310cc..a4db9193206 100644
--- a/intern/cycles/util/util_ssei.h
+++ b/intern/cycles/util/util_ssei.h
@@ -57,7 +57,7 @@ struct ssei {
   __forceinline ssei(const __m128i a) : m128(a)
   {
   }
-  __forceinline operator const __m128i &(void)const
+  __forceinline operator const __m128i &(void) const
   {
     return m128;
   }
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 1a4df846a12..cb752613cf7 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -4899,7 +4899,8 @@ static int uv_reveal_exec(bContext *C, wmOperator *op)
         if (!stickymode) {
           BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
             BM_elem_flag_disable(efa, BM_ELEM_TAG);
-            if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
+            if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) &&
+                !BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
               int totsel = 0;
               BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
                 totsel += BM_elem_flag_test(l->v, BM_ELEM_SELECT);
@@ -4919,7 +4920,8 @@ static int uv_reveal_exec(bContext *C, wmOperator *op)
         else {
           BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
             BM_elem_flag_disable(efa, BM_ELEM_TAG);
-            if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
+            if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) &&
+                !BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
               BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
                 if (BM_elem_flag_test(l->v, BM_ELEM_SELECT) == 0) {
                   luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 8992e7d38bd..d89bdcd074f 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -174,9 +174,8 @@ static void rna_Fluid_domain_reset(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_Fluid_reset_dependency(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-  FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data;
-
 #  ifdef WITH_FLUID
+  FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data;
   BKE_fluid_modifier_reset(settings->mmd);
 #  endif