[Bf-blender-cvs] [670b3c5013d] master: Cleanup: compiler warnings

[Brecht Van Lommel]

Commit: 670b3c5013d107bde5504f2ef5930fb604888ffc
Author: Brecht Van Lommel
Date:   Thu Jan 19 22:36:07 2023 +0100
Branches: master
https://developer.blender.org/rB670b3c5013d107bde5504f2ef5930fb604888ffc

Cleanup: compiler warnings

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

M	intern/cycles/kernel/data_template.h
M	source/blender/modifiers/intern/MOD_ocean.c

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

diff --git a/intern/cycles/kernel/data_template.h b/intern/cycles/kernel/data_template.h
index dceae4b77c1..f1589a4d10b 100644
--- a/intern/cycles/kernel/data_template.h
+++ b/intern/cycles/kernel/data_template.h
@@ -220,4 +220,5 @@ KERNEL_STRUCT_END(KernelSVMUsage)
 
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
+#undef KERNEL_STRUCT_MEMBER_DONT_SPECIALIZE
 #undef KERNEL_STRUCT_END
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index 9081ebd85fb..cad2f57e45a 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -336,7 +336,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
   }
 
   /* do ocean simulation */
-  if (omd->cached == true) {
+  if (omd->cached) {
     if (!omd->oceancache) {
       init_cache_data(ob, omd, resolution);
     }
@@ -403,7 +403,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
           const float v = OCEAN_CO(size_co_inv, vco[1]);
           float foam;
 
-          if (omd->oceancache && omd->cached == true) {
+          if (omd->oceancache && omd->cached) {
             BKE_ocean_cache_eval_uv(omd->oceancache, &ocr, cfra_for_cache, u, v);
             foam = ocr.foam;
             CLAMP(foam, 0.0f, 1.0f);
@@ -450,7 +450,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
       const float u = OCEAN_CO(size_co_inv, vco[0]);
       const float v = OCEAN_CO(size_co_inv, vco[1]);
 
-      if (omd->oceancache && omd->cached == true) {
+      if (omd->oceancache && omd->cached) {
         BKE_ocean_cache_eval_uv(omd->oceancache, &ocr, cfra_for_cache, u, v);
       }
       else {