[Bf-blender-cvs] [54abab53bfd] master: Cleanup: undeclared function warning, unused argument

[Campbell Barton]

Commit: 54abab53bfd83e4ff4954f2d86b1916740a6a57c
Author: Campbell Barton
Date:   Thu Jul 16 11:07:36 2020 +1000
Branches: master
https://developer.blender.org/rB54abab53bfd83e4ff4954f2d86b1916740a6a57c

Cleanup: undeclared function warning, unused argument

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

M	source/blender/editors/sculpt_paint/sculpt_automasking.c
M	source/blender/imbuf/intern/anim_movie.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.c b/source/blender/editors/sculpt_paint/sculpt_automasking.c
index 4b016b3df4d..7c8a5ce80d4 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.c
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.c
@@ -89,7 +89,7 @@ bool SCULPT_is_automasking_enabled(const Sculpt *sd, const SculptSession *ss, co
   return false;
 }
 
-int SCULPT_automasking_mode_effective_bits(const Sculpt *sculpt, const Brush *brush)
+static int sculpt_automasking_mode_effective_bits(const Sculpt *sculpt, const Brush *brush)
 {
   return sculpt->automasking_flags | brush->automasking_flags;
 }
@@ -97,7 +97,7 @@ int SCULPT_automasking_mode_effective_bits(const Sculpt *sculpt, const Brush *br
 static bool SCULPT_automasking_needs_cache(const Sculpt *sd, const Brush *brush)
 {
 
-  const int automasking_flags = SCULPT_automasking_mode_effective_bits(sd, brush);
+  const int automasking_flags = sculpt_automasking_mode_effective_bits(sd, brush);
   if (automasking_flags & BRUSH_AUTOMASKING_TOPOLOGY) {
     return true;
   }
@@ -309,7 +309,7 @@ static void SCULPT_stroke_automasking_settings_update(SculptSession *ss, Sculpt
 {
   BLI_assert(ss->cache);
 
-  ss->cache->automask_settings.flags = SCULPT_automasking_mode_effective_bits(sd, brush);
+  ss->cache->automask_settings.flags = sculpt_automasking_mode_effective_bits(sd, brush);
   ss->cache->automask_settings.initial_face_set = SCULPT_active_face_set_get(ss);
 }
 
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 220801137f5..8361c43afc1 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -306,6 +306,10 @@ struct anim *IMB_open_anim(const char *name,
 
 bool IMB_anim_can_produce_frames(const struct anim *anim)
 {
+#if !(defined(WITH_AVI) || defined(WITH_FFMPEG))
+  UNUSED_VARS(anim);
+#endif
+
 #ifdef WITH_AVI
   if (anim->avi != NULL) {
     return true;