diff options
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_select.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 0b65866298a..94053c22fcb 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -92,8 +92,8 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho ale= BLI_findlink(&anim_data, channel_index); if (ale == NULL) { /* channel not found */ - if (G.f & G_DEBUG) - printf("Error: animation channel (index = %d) not found in mouse_anim_channels() \n", channel_index); + if (G.debug & G_DEBUG) + printf("Error: animation channel (index = %d) not found in mouse_anim_channels()\n", channel_index); BLI_freelistN(&anim_data); return 0; @@ -285,8 +285,8 @@ static int mouse_nla_channels (bAnimContext *ac, float x, int channel_index, sho break; default: - if (G.f & G_DEBUG) - printf("Error: Invalid channel type in mouse_nla_channels() \n"); + if (G.debug & G_DEBUG) + printf("Error: Invalid channel type in mouse_nla_channels()\n"); } /* free channels */ diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 0b8565b93a2..7ed49025814 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -121,7 +121,7 @@ static void nla_action_draw_keyframes (AnimData *adt, bAction *act, View2D *v2d, action_to_keylist(adt, act, &keys, NULL); BLI_dlrbTree_linkedlist_sync(&keys); - if ELEM(NULL, act, keys.first) + if (ELEM(NULL, act, keys.first)) return; /* draw a darkened region behind the strips diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index d191f1d1d35..1a94b1160be 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -399,7 +399,7 @@ static int nlaedit_add_actionclip_exec (bContext *C, wmOperator *op) if (act == NULL) { BKE_report(op->reports, RPT_ERROR, "No valid Action to add"); - //printf("Add strip - actname = '%s' \n", actname); + //printf("Add strip - actname = '%s'\n", actname); return OPERATOR_CANCELLED; } else if (act->idroot == 0) { @@ -520,7 +520,7 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) NlaStrip *s1, *s2; /* get initial pair of strips */ - if ELEM(nlt->strips.first, NULL, nlt->strips.last) + if (ELEM(nlt->strips.first, NULL, nlt->strips.last)) continue; s1= nlt->strips.first; s2= s1->next; @@ -530,7 +530,7 @@ static int nlaedit_add_transition_exec (bContext *C, wmOperator *op) NlaStrip *strip; /* check if both are selected */ - if ELEM(0, (s1->flag & NLASTRIP_FLAG_SELECT), (s2->flag & NLASTRIP_FLAG_SELECT)) + if (ELEM(0, (s1->flag & NLASTRIP_FLAG_SELECT), (s2->flag & NLASTRIP_FLAG_SELECT))) continue; /* check if there's space between the two */ if (IS_EQF(s1->end, s2->start)) diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index 1434bd8ddc2..b0cd59ea7ad 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -538,7 +538,7 @@ static void mouse_nla_strips (bContext *C, bAnimContext *ac, const int mval[2], ale= BLI_findlink(&anim_data, channel_index); if (ale == NULL) { /* channel not found */ - printf("Error: animation channel (index = %d) not found in mouse_nla_strips() \n", channel_index); + printf("Error: animation channel (index = %d) not found in mouse_nla_strips()\n", channel_index); BLI_freelistN(&anim_data); return; } |