[Bf-blender-cvs] [94d2a611ec0] master: Cleanup: unused variable warning, formatting

Campbell Barton noreply at git.blender.org
Wed Jan 26 06:07:23 CET 2022


Commit: 94d2a611ec0cb66d24828aa8d21e5a1173cc8c13
Author: Campbell Barton
Date:   Wed Jan 26 16:01:11 2022 +1100
Branches: master
https://developer.blender.org/rB94d2a611ec0cb66d24828aa8d21e5a1173cc8c13

Cleanup: unused variable warning, formatting

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

M	source/blender/gpu/opengl/gl_backend.cc
M	source/blender/imbuf/intern/indexer.c

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

diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc
index c32123bc15e..92d180f1140 100644
--- a/source/blender/gpu/opengl/gl_backend.cc
+++ b/source/blender/gpu/opengl/gl_backend.cc
@@ -423,7 +423,7 @@ static void detect_workarounds()
 
   /* Buggy interface query functions cause crashes when handling SSBOs (T93680) */
   if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY) &&
-    (strstr(renderer, "HD Graphics 4400")|| strstr(renderer, "HD Graphics 4600"))) {
+      (strstr(renderer, "HD Graphics 4400") || strstr(renderer, "HD Graphics 4600"))) {
     GCaps.shader_storage_buffer_objects_support = false;
   }
 }  // namespace blender::gpu
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 67724a3bd3b..a85ba65d014 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -1446,7 +1446,10 @@ IndexBuildContext *IMB_anim_index_rebuild_context(struct anim *anim,
       context = index_ffmpeg_create_context(
           anim, tcs_in_use, proxy_sizes_to_build, quality, build_only_on_bad_performance);
       break;
+#else
+    UNUSED_VARS(build_only_on_bad_performance);
 #endif
+
 #ifdef WITH_AVI
     default:
       context = index_fallback_create_context(anim, tcs_in_use, proxy_sizes_to_build, quality);



More information about the Bf-blender-cvs mailing list