diff options
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_deps.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/drivers.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 4 |
8 files changed, 26 insertions, 25 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index cb6023e20ea..6d1ee08d5e9 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -361,7 +361,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale) offset += (short)(0.7f * U.widget_unit); /* If not in Action Editor mode, action-groups (and their children) - * must carry some offset too. */ + * must carry some offset too. */ } else if (ac->datatype != ANIMCONT_ACTION) { offset += (short)(0.7f * U.widget_unit); @@ -4526,7 +4526,7 @@ static void draw_setting_widget(bAnimContext *ac, /* get the base icon for the setting */ switch (setting) { case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */ - //icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF); + // icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF); icon = ICON_VISIBLE_IPO_OFF; if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) { @@ -4551,13 +4551,13 @@ static void draw_setting_widget(bAnimContext *ac, break; case ACHANNEL_SETTING_EXPAND: /* expanded triangle */ - //icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT); + // icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT); icon = ICON_TRIA_RIGHT; tooltip = TIP_("Make channels grouped under this channel visible"); break; case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */ - //icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON); + // icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON); icon = ICON_SOLO_OFF; tooltip = TIP_( "NLA Track is the only one evaluated in this animation data-block, with all others " @@ -4568,7 +4568,7 @@ static void draw_setting_widget(bAnimContext *ac, case ACHANNEL_SETTING_PROTECT: /* protected lock */ // TODO: what about when there's no protect needed? - //icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED); + // icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED); icon = ICON_UNLOCKED; if (ale->datatype != ALE_NLASTRIP) { @@ -4599,7 +4599,7 @@ static void draw_setting_widget(bAnimContext *ac, break; case ACHANNEL_SETTING_PINNED: /* pin icon */ - //icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED); + // icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED); icon = ICON_UNPINNED; if (ale->type == ANIMTYPE_NLAACTION) { diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 3d7684dcc6b..40abf8a12bb 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -550,8 +550,8 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, if (prevLevel == 0) { break; /* otherwise, this level weaves into another sibling hierarchy to the previous one just - * finished, so skip until we get to the parent of this level - */ + * finished, so skip until we get to the parent of this level + */ } else { continue; @@ -583,9 +583,10 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, if (level > matchLevel) { ANIM_channel_setting_set(ac, ale, setting, mode); /* however, if the level is 'less than or equal to' the channel that was changed, - * (i.e. the current channel is as important if not more important than the changed channel) - * then we should stop, since we've found the last one of the children we should flush - */ + * (i.e. the current channel is as important if not more important than the changed + * channel) then we should stop, since we've found the last one of the children we should + * flush + */ } else { break; diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c index d7fe326f2ee..5c9f0707aa9 100644 --- a/source/blender/editors/animation/anim_deps.c +++ b/source/blender/editors/animation/anim_deps.c @@ -377,7 +377,7 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data) if (ale->update & ANIM_UPDATE_ORDER) { ale->update &= ~ANIM_UPDATE_ORDER; if (gpl) { - //gpencil_sort_frames(gpl); + // gpencil_sort_frames(gpl); } } diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index d5116858970..61bf7f95340 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -169,7 +169,7 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width) immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformThemeColorShadeAlpha(TH_ANIM_PREVIEW_RANGE, -25, -30); /* XXX: Fix this hardcoded color (anim_active) */ - //immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f); + // immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f); /* only draw two separate 'curtains' if there's no overlap between them */ if (PSFRA < PEFRA + end_frame_width) { diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 6a0f7d21f55..b94d0e3ada7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -117,7 +117,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac) if (ac->yscale_fac < 0.1f) { ac->yscale_fac = 1.0f; } - //printf("yscale_fac = %f\n", ac->yscale_fac); + // printf("yscale_fac = %f\n", ac->yscale_fac); } /* ----------- Private Stuff - Action Editor ------------- */ @@ -136,7 +136,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac) } /* XXX pinning is not available in 'ShapeKey' mode... */ - //if (saction->pin) return NULL; + // if (saction->pin) return NULL; /* shapekey data is stored with geometry data */ key = BKE_key_from_object(ob); @@ -218,7 +218,7 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction) { /* TODO, other methods to get the mask */ // Sequence *seq = BKE_sequencer_active_get(ac->scene); - //MovieClip *clip = ac->scene->clip; + // MovieClip *clip = ac->scene->clip; // struct Mask *mask = seq ? seq->mask : NULL; /* update scene-pointer (no need to check for pinning yet, as not implemented) */ @@ -1324,7 +1324,7 @@ static size_t animfilter_act_group(bAnimContext *ac, ListBase tmp_data = {NULL, NULL}; size_t tmp_items = 0; size_t items = 0; - //int ofilter = filter_mode; + // int ofilter = filter_mode; /* if we care about the selection status of the channels, * but the group isn't expanded (1)... @@ -1384,7 +1384,7 @@ static size_t animfilter_act_group(bAnimContext *ac, /* add this group as a channel first */ if (filter_mode & ANIMFILTER_LIST_CHANNELS) { /* restore original filter mode so that this next step works ok... */ - //filter_mode = ofilter; + // filter_mode = ofilter; /* filter selection of channel specially here again, * since may be open and not subject to previous test */ diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 67beecac2c0..66cdae07a36 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -203,7 +203,7 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la float min, max; /* sanity check */ - //printf("markers = %p - %p, %p\n", markers, markers->first, markers->last); + // printf("markers = %p - %p, %p\n", markers, markers->first, markers->last); if (ELEM(NULL, markers, markers->first, markers->last)) { *first = 0.0f; *last = 0.0f; diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 34d7fac041f..2a8702802aa 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -1140,7 +1140,7 @@ void ANIM_OT_driver_button_remove(wmOperatorType *ot) /* callbacks */ ot->exec = remove_driver_button_exec; - //op->poll = ??? // TODO: need to have some driver to be able to do this... + // op->poll = ??? // TODO: need to have some driver to be able to do this... /* flags */ ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -1177,7 +1177,7 @@ void ANIM_OT_driver_button_edit(wmOperatorType *ot) /* callbacks */ ot->exec = edit_driver_button_exec; - //op->poll = ??? // TODO: need to have some driver to be able to do this... + // op->poll = ??? // TODO: need to have some driver to be able to do this... /* flags */ ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -1221,7 +1221,7 @@ void ANIM_OT_copy_driver_button(wmOperatorType *ot) /* callbacks */ ot->exec = copy_driver_button_exec; - //op->poll = ??? // TODO: need to have some driver to be able to do this... + // op->poll = ??? // TODO: need to have some driver to be able to do this... /* flags */ ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL; @@ -1270,7 +1270,7 @@ void ANIM_OT_paste_driver_button(wmOperatorType *ot) /* callbacks */ ot->exec = paste_driver_button_exec; - //op->poll = ??? // TODO: need to have some driver to be able to do this... + // op->poll = ??? // TODO: need to have some driver to be able to do this... /* flags */ ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL; diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 3fd2e4382af..ab5e3186c47 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -377,7 +377,7 @@ void ANIM_OT_keyingset_button_add(wmOperatorType *ot) /* callbacks */ ot->exec = add_keyingset_button_exec; - //op->poll = ??? + // op->poll = ??? /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -459,7 +459,7 @@ void ANIM_OT_keyingset_button_remove(wmOperatorType *ot) /* callbacks */ ot->exec = remove_keyingset_button_exec; - //op->poll = ??? + // op->poll = ??? /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; |