[Bf-blender-cvs] [96708701abd] master: Cleanup: unused vars
Campbell Barton
noreply at git.blender.org
Wed Jun 12 01:45:04 CEST 2019
Commit: 96708701abdb0688dfbbc5c97134a0ff45b2f09d
Author: Campbell Barton
Date: Wed Jun 12 08:16:58 2019 +1000
Branches: master
https://developer.blender.org/rB96708701abdb0688dfbbc5c97134a0ff45b2f09d
Cleanup: unused vars
===================================================================
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/editors/armature/armature_utils.c
===================================================================
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index d7546e5db0c..ae786a7d2c5 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -408,8 +408,7 @@ NlaStrip *BKE_nla_add_soundstrip(Main *bmain, Scene *scene, Speaker *speaker)
{
strip->end = 10.0f;
/* quiet compiler warnings */
- (void)scene;
- (void)speaker;
+ UNUSED_VARS(bmain, scene, speaker);
}
/* general settings */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 215f651811c..bfc6565819c 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1057,6 +1057,7 @@ void BKE_sequence_reload_new_file(Main *bmain, Scene *scene, Sequence *seq, cons
seq->len = 0;
}
#else
+ UNUSED_VARS(bmain);
return;
#endif
break;
@@ -4962,7 +4963,7 @@ void BKE_sequencer_refresh_sound_length(Main *bmain, Scene *scene)
sequencer_refresh_sound_length_recursive(bmain, scene, &scene->ed->seqbase);
}
#else
- (void)scene;
+ UNUSED_VARS(bmain, scene);
#endif
}
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 927a45accca..dfa0783de06 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -1199,7 +1199,7 @@ int BKE_sound_scene_playing(Scene *UNUSED(scene))
}
void BKE_sound_read_waveform(Main *bmain, bSound *sound, short *stop)
{
- UNUSED_VARS(sound, stop);
+ UNUSED_VARS(sound, stop, bmain);
}
void BKE_sound_init_main(Main *UNUSED(bmain))
{
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c
index c67a031317c..5d424594229 100644
--- a/source/blender/editors/armature/armature_utils.c
+++ b/source/blender/editors/armature/armature_utils.c
@@ -429,9 +429,7 @@ void ED_armature_ebone_transform_mirror_update(bArmature *arm, EditBone *ebo, bo
void ED_armature_edit_transform_mirror_update(Object *obedit)
{
bArmature *arm = obedit->data;
- EditBone *ebo, *eboflip;
-
- for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
+ for (EditBone *ebo = arm->edbo->first; ebo; ebo = ebo->next) {
ED_armature_ebone_transform_mirror_update(arm, ebo, true);
}
}
More information about the Bf-blender-cvs
mailing list