Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-16 12:15:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-16 12:15:53 +0400
commitaf93ebcb503293e382f74c2d33554504269d4815 (patch)
treee4490d7be44e3532e1655f82c7a7aeb11cc5785c /source/blender/editors/animation
parentbb1a7e4d8722fda09a3294eea56a537b6f043dd3 (diff)
Code Cleanup: style and redundant casts
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/keyframes_edit.c2
-rw-r--r--source/blender/editors/animation/keyframing.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 65669062667..6010a64bd06 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -121,7 +121,7 @@ short ANIM_fcurve_keyframes_loop(KeyframeEditData *ked, FCurve *fcu, KeyframeEdi
}
/* Only operate on this BezTriple if it fullfills the criteria of the validation func */
- if ( (ok = key_ok(ked, bezt)) ) {
+ if ((ok = key_ok(ked, bezt))) {
if (ked) ked->curflags = ok;
/* Exit with return-code '1' if function returns positive
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 1b77c1530bf..2fd30ed5ecc 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1984,7 +1984,7 @@ static short object_frame_has_keyframe(Object *ob, float frame, short filter)
}
/* try shapekey keyframes (if available, and allowed by filter) */
- if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY) ) {
+ if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY)) {
Key *key = BKE_key_from_object(ob);
/* shapekeys can have keyframes ('Relative Shape Keys')
@@ -2000,7 +2000,7 @@ static short object_frame_has_keyframe(Object *ob, float frame, short filter)
}
/* try materials */
- if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOMAT) ) {
+ if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOMAT)) {
/* if only active, then we can skip a lot of looping */
if (filter & ANIMFILTER_KEYS_ACTIVE) {
Material *ma = give_current_material(ob, (ob->actcol + 1));