blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: undeclared function warning, unused argument

This commit is contained in:
Campbell Barton 2020-07-16 11:07:36 +10:00
parent a3d90337b8
commit 54abab53bf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/sculpt_paint/sculpt_automasking.c
View File

@ -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);
}

4
source/blender/imbuf/intern/anim_movie.c
View File

@ -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;