2.5 - NLA SoC Branch Merged to 2.5!
[blender.git] / source / blender / editors / space_graph / graph_draw.c
index ddf4105fdf440d24c35dbf35fd26d26fd76e0b87..8b242794ca301cc48169e874b3ab2dcd2d074a23 100644 (file)
@@ -835,12 +835,12 @@ void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGri
         */
        for (ale=anim_data.first; ale; ale=ale->next) {
                FCurve *fcu= (FCurve *)ale->key_data;
-               FModifier *fcm= fcurve_find_active_modifier(fcu);
-               //Object *nob= ANIM_nla_mapping_get(ac, ale);
+               FModifier *fcm= find_active_fmodifier(&fcu->modifiers);
+               AnimData *adt= ANIM_nla_mapping_get(ac, ale);
                
                /* map keyframes for drawing if scaled F-Curve */
-               //if (nob)
-               //      ANIM_nla_mapping_apply_fcurve(nob, ale->key_data, 0, 0); 
+               if (adt)
+                       ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 0); 
                
                /* draw curve:
                 *      - curve line may be result of one or more destructive modifiers or just the raw data,
@@ -918,8 +918,8 @@ void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGri
                }
                
                /* undo mapping of keyframes for drawing if scaled F-Curve */
-               //if (nob)
-               //      ANIM_nla_mapping_apply_fcurve(nob, ale->key_data, 1, 0); 
+               if (adt)
+                       ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 0); 
        }
        
        /* free list of curves */
@@ -1206,6 +1206,17 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                                        expand = ICON_TRIA_RIGHT;
                                        }
                                        
+                                       /* for now, 'special' (i.e. in front of name) is used to show visibility status */
+                                       if (agrp->flag & AGRP_NOTVISIBLE)
+                                               special= ICON_CHECKBOX_DEHLT;
+                                       else
+                                               special= ICON_CHECKBOX_HLT;
+                                       
+                                       if (agrp->flag & AGRP_MUTED)
+                                               mute = ICON_MUTE_IPO_ON;
+                                       else    
+                                               mute = ICON_MUTE_IPO_OFF;
+                                       
                                        if (EDITABLE_AGRP(agrp))
                                                protect = ICON_UNLOCKED;
                                        else