Merged changes in the trunk up to revision 51718.
[blender.git] / source / blender / editors / animation / anim_channels_defines.c
index 12c0e851f8894c8ee542ed4d8da6e006548b8ff2..81ebca7b2fbaea13fc59d78e18223d2229f90d88 100644 (file)
@@ -1187,7 +1187,7 @@ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, int setting, short *type)
                        if (ma->adt)
                                return GET_ACF_FLAG_PTR(ma->adt->flag, type);
                        else
-                               return NULL;    
+                               return NULL;
                
                default: /* unsupported */
                        return NULL;
@@ -1264,7 +1264,7 @@ static void *acf_dslam_setting_ptr(bAnimListElem *ale, int setting, short *type)
                        if (la->adt)
                                return GET_ACF_FLAG_PTR(la->adt->flag, type);
                        else
-                               return NULL;    
+                               return NULL;
                
                default: /* unsupported */
                        return NULL;
@@ -1348,7 +1348,7 @@ static void *acf_dstex_setting_ptr(bAnimListElem *ale, int setting, short *type)
                        if (tex->adt)
                                return GET_ACF_FLAG_PTR(tex->adt->flag, type);
                        else
-                               return NULL;    
+                               return NULL;
                
                default: /* unsupported */
                        return NULL;
@@ -3330,7 +3330,7 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
        /* get the flag and the pointer to that flag */
        flag = acf->setting_flag(ac, setting, &negflag);
        ptr = acf->setting_ptr(ale, setting, &ptrsize);
-       /* enabled= ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */
+       /* enabled = ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */
        
        /* get the base icon for the setting */
        switch (setting) {
@@ -3345,13 +3345,13 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
                        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 = "Make channels grouped under this channel visible";
                        break;
                        
                case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */
-                       //icon= ((enabled)? ICON_LAYER_ACTIVE : ICON_LAYER_USED);
+                       //icon = ((enabled)? ICON_LAYER_ACTIVE : ICON_LAYER_USED);
                        icon = ICON_LAYER_USED;
                        tooltip = "NLA Track is the only one evaluated for the AnimData block it belongs to";
                        break;
@@ -3360,13 +3360,13 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
                
                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;
                        tooltip = "Editability of keyframes for this channel";
                        break;
                        
                case ACHANNEL_SETTING_MUTE: /* muted speaker */
-                       //icon= ((enabled)? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF);
+                       //icon = ((enabled)? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF);
                        icon = ICON_MUTE_IPO_OFF;
                        
                        if (ale->type == ALE_FCURVE) 
@@ -3449,7 +3449,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
        y = (ymaxc - yminc) / 2 + yminc;
        ymid = y - 7;
        /* y-coordinates for text is only 4 down from middle */
-       /* ytext= y - 4; */
+       /* ytext = y - 4; */
        
        /* no button backdrop behind icons */
        uiBlockSetEmboss(block, UI_EMBOSSN);