svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / editors / animation / anim_channels_defines.c
index b16420a70948cafbdab87ba496e08a9baee1baf6..0ef470a698e0d38153b8f5d2e61496ed68083516 100644 (file)
@@ -1972,7 +1972,7 @@ void ANIM_channel_draw (bAnimContext *ac, bAnimListElem *ale, float yminc, float
                offset += 3;
                UI_DrawString(offset, ytext, name);
        }
-}
+               }
 
 /* ------------------ */
 
@@ -2206,17 +2206,17 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
                
                /* check if there's enough space for the toggles if the sliders are drawn too */
                if ( !(draw_sliders) || ((v2d->mask.xmax-v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH/2) ) {
-                       /* protect... */
-                       if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) {
-                               offset += ICON_WIDTH; 
-                               draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_PROTECT);
-                       }
-                       /* mute... */
-                       if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) {
-                               offset += ICON_WIDTH;
-                               draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_MUTE);
-                       }
+               /* protect... */
+               if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) {
+                       offset += ICON_WIDTH; 
+                       draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_PROTECT);
                }
+               /* mute... */
+               if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) {
+                       offset += ICON_WIDTH;
+                       draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_MUTE);
+               }
+       }
                
                /* draw slider
                 *      - even if we can draw sliders for this view, we must also check that the channel-type supports them
@@ -2248,7 +2248,7 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
                                        /* create the slider button, and assign relevant callback to ensure keyframes are inserted... */
                                        but= uiDefAutoButR(block, &ptr, prop, fcu->array_index, "", 0, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc);
                                        uiButSetFunc(but, achannel_setting_slider_cb, ale->id, fcu);
-                               }
+}
                        }
                        else { /* Special Slider for stuff without RNA Access ---------- */
                                // TODO: only implement this case when we really need it...