style cleanup: misc editor changes.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2012 11:48:19 +0000 (11:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2012 11:48:19 +0000 (11:48 +0000)
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/animation/keyframing.c
source/blender/editors/curve/editfont.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_ops.c
source/blender/editors/space_script/space_script.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/imbuf/intern/rectop.c

index b62222317bd40a1acb317df7f20ab51ea0e5cac8..2e683d4d57b5f0bd4e67252fa1b94646b7ba24e5 100644 (file)
 // XXX constant defines to be moved elsewhere?
 
 /* extra padding for lengths (to go under scrollers) */
-#define EXTRA_SCROLL_PAD       100.0f
+#define EXTRA_SCROLL_PAD    100.0f
 
 /* size of indent steps */
-#define INDENT_STEP_SIZE       7
+#define INDENT_STEP_SIZE    7
 
 #define ANIM_CHAN_NAME_SIZE 256
 
@@ -107,10 +107,10 @@ static void acf_generic_root_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUS
 /* backdrop for top-level widgets (Scene and Object only) */
 static void acf_generic_root_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
-       short expanded= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0;
-       short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
+       short expanded = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0;
+       short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
        float color[3];
        
        /* set backdrop drawing color */
@@ -119,7 +119,7 @@ static void acf_generic_root_backdrop(bAnimContext *ac, bAnimListElem *ale, floa
        
        /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */
        uiSetRoundBox(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT));
-       uiDrawBox(GL_POLYGON, offset,  yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8);
+       uiDrawBox(GL_POLYGON, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
 }
 
 
@@ -133,9 +133,9 @@ static void acf_generic_dataexpand_color(bAnimContext *UNUSED(ac), bAnimListElem
 /* backdrop for data expanders under top-level Scene/Object */
 static void acf_generic_dataexpand_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
-       short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
+       short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
        float color[3];
        
        /* set backdrop drawing color */
@@ -143,24 +143,24 @@ static void acf_generic_dataexpand_backdrop(bAnimContext *ac, bAnimListElem *ale
        glColor3fv(color);
        
        /* no rounded corner - just rectangular box */
-       glRectf(offset, yminc,  v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc);
+       glRectf(offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
 }
 
 /* get backdrop color for generic channels */
 static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, float r_color[3])
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        SpaceAction *saction = NULL;
        bActionGroup *grp = NULL;
-       short indent= (acf->get_indent_level) ? acf->get_indent_level(ac, ale) : 0;
+       short indent = (acf->get_indent_level) ? acf->get_indent_level(ac, ale) : 0;
        
        /* get context info needed... */
        if ((ac->sl) && (ac->spacetype == SPACE_ACTION))
-               saction= (SpaceAction *)ac->sl;
+               saction = (SpaceAction *)ac->sl;
                
        if (ale->type == ANIMTYPE_FCURVE) {
-               FCurve *fcu= (FCurve *)ale->data;
-               grp= fcu->grp;
+               FCurve *fcu = (FCurve *)ale->data;
+               grp = fcu->grp;
        }
        
        /* set color for normal channels 
@@ -168,7 +168,7 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa
         *      - only use group colors if allowed to, and if actually feasible
         */
        if ( (saction && !(saction->flag & SACTION_NODRAWGCOLORS)) && 
-                ((grp) && (grp->customCol)) ) 
+            ((grp) && (grp->customCol)) )
        {
                unsigned char cp[3];
                
@@ -187,7 +187,7 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa
        }
        else {
                // FIXME: what happens when the indention is 1 greater than what it should be (due to grouping)?
-               int colOfs= 20 - 20*indent;
+               int colOfs = 20 - 20 * indent;
                UI_GetThemeColorShade3fv(TH_HEADER, colOfs, r_color);
        }
 }
@@ -195,9 +195,9 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa
 /* backdrop for generic channels */
 static void acf_generic_channel_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
-       short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
+       short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
        float color[3];
        
        /* set backdrop drawing color */
@@ -205,7 +205,7 @@ static void acf_generic_channel_backdrop(bAnimContext *ac, bAnimListElem *ale, f
        glColor3fv(color);
        
        /* no rounded corners - just rectangular box */
-       glRectf(offset, yminc,  v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc);
+       glRectf(offset, yminc,  v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
 }
 
 /* Indention + Offset ------------------------------------------- */
@@ -229,11 +229,11 @@ static short acf_generic_indention_2(bAnimContext *ac, bAnimListElem *ale)
 /* indention which varies with the grouping status */
 static short acf_generic_indention_flexible(bAnimContext *UNUSED(ac), bAnimListElem *ale)
 {
-       short indent= 0;
+       short indent = 0;
        
        /* grouped F-Curves need extra level of indention */
        if (ale->type == ANIMTYPE_FCURVE) {
-               FCurve *fcu= (FCurve *)ale->data;
+               FCurve *fcu = (FCurve *)ale->data;
                
                // TODO: we need some way of specifying that the indention color should be one less...
                if (fcu->grp)
@@ -247,7 +247,7 @@ static short acf_generic_indention_flexible(bAnimContext *UNUSED(ac), bAnimListE
 /* basic offset for channels derived from indention */
 static short acf_generic_basic_offset(bAnimContext *ac, bAnimListElem *ale)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        
        if (acf && acf->get_indent_level)
                return acf->get_indent_level(ac, ale) * INDENT_STEP_SIZE;
@@ -272,7 +272,7 @@ static short acf_nodetree_rootType_offset(bNodeTree *ntree)
                                
                        case NTREE_TEXTURE:
                                /* 2 additional levels */
-                               return INDENT_STEP_SIZE*2; 
+                               return INDENT_STEP_SIZE * 2;
                }
        }
        
@@ -283,7 +283,7 @@ static short acf_nodetree_rootType_offset(bNodeTree *ntree)
 /* offset for groups + grouped entities */
 static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
 {
-       short offset= acf_generic_basic_offset(ac, ale);
+       short offset = acf_generic_basic_offset(ac, ale);
        
        if (ale->id) {
                /* texture animdata */
@@ -300,7 +300,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
                        
                /* nodetree animdata */
                if (GS(ale->id->name) == ID_NT) {
-                       offset += acf_nodetree_rootType_offset((bNodeTree*)ale->id);
+                       offset += acf_nodetree_rootType_offset((bNodeTree *)ale->id);
                }
        }
        
@@ -313,11 +313,11 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
 /* name for ID block entries */
 static void acf_generic_idblock_name(bAnimListElem *ale, char *name)
 {
-       ID *id= (ID *)ale->data;        /* data pointed to should be an ID block */
+       ID *id = (ID *)ale->data;    /* data pointed to should be an ID block */
        
        /* just copy the name... */
        if (id && name)
-               BLI_strncpy(name, id->name+2, ANIM_CHAN_NAME_SIZE);
+               BLI_strncpy(name, id->name + 2, ANIM_CHAN_NAME_SIZE);
 }
 
 /* name property for ID block entries */
@@ -377,7 +377,7 @@ static short acf_generic_dataexpand_setting_valid(bAnimContext *ac, bAnimListEle
 static void acf_summary_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), float r_color[3])
 {
        // FIXME: hardcoded color - same as the 'action' line in NLA
-               // reddish color 
+       // reddish color
        r_color[0] = 0.8f;
        r_color[1] = 0.2f;
        r_color[2] = 0.0f;
@@ -386,8 +386,8 @@ static void acf_summary_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(al
 /* backdrop for summary widget */
 static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
        float color[3];
        
        /* set backdrop drawing color */
@@ -399,7 +399,7 @@ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float ymi
         *      - special hack: make the top a bit higher, since we are first... 
         */
        uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT);
-       uiDrawBox(GL_POLYGON, 0,  yminc-2, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8);
+       uiDrawBox(GL_POLYGON, 0,  yminc - 2, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
 }
 
 /* name for summary entries */
@@ -427,12 +427,12 @@ static int acf_summary_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 {
        if (setting == ACHANNEL_SETTING_EXPAND) {
                /* expanded */
-               *neg= 1;
+               *neg = 1;
                return ADS_FLAG_SUMMARY_COLLAPSED;
        }
        else {
                /* unsupported */
-               *neg= 0;
+               *neg = 0;
                return 0;
        }
 }
@@ -440,21 +440,21 @@ static int acf_summary_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       bAnimContext *ac= (bAnimContext *)ale->data;
+       bAnimContext *ac = (bAnimContext *)ale->data;
        
        /* if data is valid, return pointer to active dopesheet's relevant flag 
         *      - this is restricted to DopeSheet/Action Editor only
         */
        if ((ac->sl) && (ac->spacetype == SPACE_ACTION) && (setting == ACHANNEL_SETTING_EXPAND)) {
-               SpaceAction *saction= (SpaceAction *)ac->sl;
-               bDopeSheet *ads= &saction->ads;
+               SpaceAction *saction = (SpaceAction *)ac->sl;
+               bDopeSheet *ads = &saction->ads;
                
                /* return pointer to DopeSheet's flag */
                return GET_ACF_FLAG_PTR(ads->flag, type);
        }
        else {
                /* can't return anything useful - unsupported */
-               *type= 0;
+               *type = 0;
                return NULL;
        }
 }
@@ -462,20 +462,20 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ
 /* all animation summary (DopeSheet only) type define */
 static bAnimChannelType ACF_SUMMARY = 
 {
-       "Summary",                                                      /* type name */
+       "Summary",                          /* type name */
 
-       acf_summary_color,                                      /* backdrop color */
-       acf_summary_backdrop,                           /* backdrop */
-       acf_generic_indention_0,                        /* indent level */
-       NULL,                                                           /* offset */
-       
-       acf_summary_name,                                       /* name */
-       NULL,                                                           /* name prop */
-       acf_summary_icon,                                       /* icon */
-       
-       acf_summary_setting_valid,                      /* has setting */
-       acf_summary_setting_flag,                       /* flag for setting */
-       acf_summary_setting_ptr                         /* pointer for setting */
+       acf_summary_color,                  /* backdrop color */
+       acf_summary_backdrop,               /* backdrop */
+       acf_generic_indention_0,            /* indent level */
+       NULL,                               /* offset */
+
+       acf_summary_name,                   /* name */
+       NULL,                               /* name prop */
+       acf_summary_icon,                   /* icon */
+
+       acf_summary_setting_valid,          /* has setting */
+       acf_summary_setting_flag,           /* flag for setting */
+       acf_summary_setting_ptr             /* pointer for setting */
 };
 
 /* Scene ------------------------------------------- */
@@ -512,21 +512,21 @@ static short acf_scene_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale
 static int acf_scene_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
                        return SCE_DS_SELECTED;
                        
                case ACHANNEL_SETTING_EXPAND: /* expanded */
-                       *neg= 1;
+                       *neg = 1;
                        return SCE_DS_COLLAPSED;
                        
                case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                default: /* unsupported */
@@ -537,10 +537,10 @@ static int acf_scene_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_scene_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Scene *scene= (Scene *)ale->data;
+       Scene *scene = (Scene *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -564,28 +564,28 @@ static void *acf_scene_setting_ptr(bAnimListElem *ale, int setting, short *type)
 /* scene type define */
 static bAnimChannelType ACF_SCENE = 
 {
-       "Scene",                                                /* type name */
+       "Scene",                        /* type name */
 
-       acf_generic_root_color,                 /* backdrop color */
-       acf_generic_root_backdrop,              /* backdrop */
-       acf_generic_indention_0,                /* indent level */
-       NULL,                                                   /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_scene_icon,                                 /* icon */
-       
-       acf_scene_setting_valid,                /* has setting */
-       acf_scene_setting_flag,                 /* flag for setting */
-       acf_scene_setting_ptr                   /* pointer for setting */
+       acf_generic_root_color,         /* backdrop color */
+       acf_generic_root_backdrop,      /* backdrop */
+       acf_generic_indention_0,        /* indent level */
+       NULL,                           /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_scene_icon,                 /* icon */
+
+       acf_scene_setting_valid,        /* has setting */
+       acf_scene_setting_flag,         /* flag for setting */
+       acf_scene_setting_ptr           /* pointer for setting */
 };
 
 /* Object ------------------------------------------- */
 
 static int acf_object_icon(bAnimListElem *ale)
 {
-       Base *base= (Base *)ale->data;
-       Object *ob= base->object;
+       Base *base = (Base *)ale->data;
+       Object *ob = base->object;
        
        /* icon depends on object-type */
 
@@ -621,19 +621,19 @@ static int acf_object_icon(bAnimListElem *ale)
 /* name for object */
 static void acf_object_name(bAnimListElem *ale, char *name)
 {
-       Base *base= (Base *)ale->data;
-       Object *ob= base->object;
+       Base *base = (Base *)ale->data;
+       Object *ob = base->object;
        
        /* just copy the name... */
        if (ob && name)
-               BLI_strncpy(name, ob->id.name+2, ANIM_CHAN_NAME_SIZE);
+               BLI_strncpy(name, ob->id.name + 2, ANIM_CHAN_NAME_SIZE);
 }
 
 /* check if some setting exists for this channel */
 static short acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, int setting)
 {
-       Base *base= (Base *)ale->data;
-       Object *ob= base->object;
+       Base *base = (Base *)ale->data;
+       Object *ob = base->object;
        
        switch (setting) {
                /* muted only in NLA */
@@ -658,21 +658,21 @@ static short acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, int
 static int acf_object_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
                        return SELECT;
                        
                case ACHANNEL_SETTING_EXPAND: /* expanded */
-                       *neg= 1;
+                       *neg = 1;
                        return OB_ADS_COLLAPSED;
                        
                case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                default: /* unsupported */
@@ -683,11 +683,11 @@ static int acf_object_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_object_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Base *base= (Base *)ale->data;
-       Object *ob= base->object;
+       Base *base = (Base *)ale->data;
+       Object *ob = base->object;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -711,20 +711,20 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, int setting, short *type
 /* object type define */
 static bAnimChannelType ACF_OBJECT = 
 {
-       "Object",                                               /* type name */
+       "Object",                       /* type name */
        
-       acf_generic_root_color,                 /* backdrop color */
-       acf_generic_root_backdrop,              /* backdrop */
-       acf_generic_indention_0,                /* indent level */
-       NULL,                                                   /* offset */
-       
-       acf_object_name,                                /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_object_icon,                                /* icon */
-       
-       acf_object_setting_valid,               /* has setting */
-       acf_object_setting_flag,                /* flag for setting */
-       acf_object_setting_ptr                  /* pointer for setting */
+       acf_generic_root_color,         /* backdrop color */
+       acf_generic_root_backdrop,      /* backdrop */
+       acf_generic_indention_0,        /* indent level */
+       NULL,                           /* offset */
+
+       acf_object_name,                /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_object_icon,                /* icon */
+
+       acf_object_setting_valid,       /* has setting */
+       acf_object_setting_flag,        /* flag for setting */
+       acf_object_setting_ptr          /* pointer for setting */
 };
 
 /* Group ------------------------------------------- */
@@ -742,10 +742,10 @@ static void acf_group_color(bAnimContext *UNUSED(ac), bAnimListElem *ale, float
 /* backdrop for group widget */
 static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
-       short expanded= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0;
-       short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
+       short expanded = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0;
+       short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0;
        float color[3];
        
        /* set backdrop drawing color */
@@ -754,13 +754,13 @@ static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc
        
        /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */
        uiSetRoundBox(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT));
-       uiDrawBox(GL_POLYGON, offset,  yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8);
+       uiDrawBox(GL_POLYGON, offset,  yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8);
 }
 
 /* name for group entries */
 static void acf_group_name(bAnimListElem *ale, char *name)
 {
-       bActionGroup *agrp= (bActionGroup *)ale->data;
+       bActionGroup *agrp = (bActionGroup *)ale->data;
        
        /* just copy the name... */
        if (agrp && name)
@@ -782,7 +782,7 @@ static short acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale
        /* for now, all settings are supported, though some are only conditionally */
        switch (setting) {
                case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */
-                       return (ac->spacetype==SPACE_IPO);
+                       return (ac->spacetype == SPACE_IPO);
                        
                default: /* always supported */
                        return 1;
@@ -793,7 +793,7 @@ static short acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale
 static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -806,8 +806,8 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
                         * proved to be a hazard for workflows...
                         */
                        return (ac->spacetype == SPACE_IPO) ? 
-                                               AGRP_EXPANDED_G :       /* Graph Editor case */
-                                               AGRP_EXPANDED;          /* DopeSheet and elsewhere */
+                              AGRP_EXPANDED_G :        /* Graph Editor case */
+                              AGRP_EXPANDED;           /* DopeSheet and elsewhere */
                }
                        
                case ACHANNEL_SETTING_MUTE: /* muted */
@@ -818,7 +818,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
                        return AGRP_PROTECTED;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visiblity - graph editor */
-                       *neg= 1;
+                       *neg = 1;
                        return AGRP_NOTVISIBLE;
        }
        
@@ -829,7 +829,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
 /* get pointer to the setting */
 static void *acf_group_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
 {
-       bActionGroup *agrp= (bActionGroup *)ale->data;
+       bActionGroup *agrp = (bActionGroup *)ale->data;
        
        /* all flags are just in agrp->flag for now... */
        return GET_ACF_FLAG_PTR(agrp->flag, type);
@@ -838,20 +838,20 @@ static void *acf_group_setting_ptr(bAnimListElem *ale, int UNUSED(setting), shor
 /* group type define */
 static bAnimChannelType ACF_GROUP = 
 {
-       "Group",                                                /* type name */
+       "Group",                        /* type name */
        
-       acf_group_color,                                /* backdrop color */
-       acf_group_backdrop,                             /* backdrop */
-       acf_generic_indention_0,                /* indent level */
-       acf_generic_group_offset,               /* offset */
-       
-       acf_group_name,                                 /* name */
-       acf_group_name_prop,                    /* name prop */
-       NULL,                                                   /* icon */
-       
-       acf_group_setting_valid,                /* has setting */
-       acf_group_setting_flag,                 /* flag for setting */
-       acf_group_setting_ptr                   /* pointer for setting */
+       acf_group_color,                /* backdrop color */
+       acf_group_backdrop,             /* backdrop */
+       acf_generic_indention_0,        /* indent level */
+       acf_generic_group_offset,       /* offset */
+
+       acf_group_name,                 /* name */
+       acf_group_name_prop,            /* name prop */
+       NULL,                           /* icon */
+
+       acf_group_setting_valid,        /* has setting */
+       acf_group_setting_flag,         /* flag for setting */
+       acf_group_setting_ptr           /* pointer for setting */
 };
 
 /* F-Curve ------------------------------------------- */
@@ -865,7 +865,7 @@ static void acf_fcurve_name(bAnimListElem *ale, char *name)
 /* check if some setting exists for this channel */
 static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int setting)
 {
-       FCurve *fcu= (FCurve *)ale->data;
+       FCurve *fcu = (FCurve *)ale->data;
        
        switch (setting) {
                /* unsupported */
@@ -877,10 +877,10 @@ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int
                        if (fcu->bezt)
                                return 1;
                        else
-                               return 0; // NOTE: in this special case, we need to draw ICON_ZOOMOUT
+                               return 0;  // NOTE: in this special case, we need to draw ICON_ZOOMOUT
                                
                case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */
-                       return (ac->spacetype==SPACE_IPO);
+                       return (ac->spacetype == SPACE_IPO);
                        
                /* always available */
                default:
@@ -892,7 +892,7 @@ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int
 static int acf_fcurve_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -916,7 +916,7 @@ static int acf_fcurve_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_fcurve_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
 {
-       FCurve *fcu= (FCurve *)ale->data;
+       FCurve *fcu = (FCurve *)ale->data;
        
        /* all flags are just in agrp->flag for now... */
        return GET_ACF_FLAG_PTR(fcu->flag, type);
@@ -925,20 +925,20 @@ static void *acf_fcurve_setting_ptr(bAnimListElem *ale, int UNUSED(setting), sho
 /* fcurve type define */
 static bAnimChannelType ACF_FCURVE = 
 {
-       "F-Curve",                                              /* type name */
+       "F-Curve",                      /* type name */
        
-       acf_generic_channel_color,              /* backdrop color */
-       acf_generic_channel_backdrop,   /* backdrop */
-       acf_generic_indention_flexible, /* indent level */              // xxx rename this to f-curves only?
-       acf_generic_group_offset,               /* offset */
-       
-       acf_fcurve_name,                                /* name */
-       NULL,                                                   /* name prop */
-       NULL,                                                   /* icon */
-       
-       acf_fcurve_setting_valid,               /* has setting */
-       acf_fcurve_setting_flag,                /* flag for setting */
-       acf_fcurve_setting_ptr                  /* pointer for setting */
+       acf_generic_channel_color,      /* backdrop color */
+       acf_generic_channel_backdrop,   /* backdrop */
+       acf_generic_indention_flexible, /* indent level */      // xxx rename this to f-curves only?
+       acf_generic_group_offset,       /* offset */
+
+       acf_fcurve_name,                /* name */
+       NULL,                           /* name prop */
+       NULL,                           /* icon */
+
+       acf_fcurve_setting_valid,       /* has setting */
+       acf_fcurve_setting_flag,        /* flag for setting */
+       acf_fcurve_setting_ptr          /* pointer for setting */
 };
 
 /* Object Action Expander  ------------------------------------------- */
@@ -967,14 +967,14 @@ static short acf_fillactd_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem
 static int acf_fillactd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
                        return ADT_UI_SELECTED;
                        
                case ACHANNEL_SETTING_EXPAND: /* expanded */
-                       *neg= 1;
+                       *neg = 1;
                        return ACT_COLLAPSED;
                
                default: /* unsupported */
@@ -985,11 +985,11 @@ static int acf_fillactd_setting_flag(bAnimContext *UNUSED(ac), int setting, shor
 /* get pointer to the setting */
 static void *acf_fillactd_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       bAction *act= (bAction *)ale->data;
-       AnimData *adt= ale->adt;
+       bAction *act = (bAction *)ale->data;
+       AnimData *adt = ale->adt;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1010,20 +1010,20 @@ static void *acf_fillactd_setting_ptr(bAnimListElem *ale, int setting, short *ty
 /* object action expander type define */
 static bAnimChannelType ACF_FILLACTD = 
 {
-       "Ob-Action Filler",                             /* type name */
+       "Ob-Action Filler",             /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idfill_nameprop,    /* name prop */
-       acf_fillactd_icon,                              /* icon */
-       
-       acf_fillactd_setting_valid,             /* has setting */
-       acf_fillactd_setting_flag,              /* flag for setting */
-       acf_fillactd_setting_ptr                /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idfill_nameprop,    /* name prop */
+       acf_fillactd_icon,              /* icon */
+
+       acf_fillactd_setting_valid,     /* has setting */
+       acf_fillactd_setting_flag,      /* flag for setting */
+       acf_fillactd_setting_ptr        /* pointer for setting */
 };
 
 /* Drivers Expander  ------------------------------------------- */
@@ -1057,11 +1057,11 @@ static short acf_filldrivers_setting_valid(bAnimContext *UNUSED(ac), bAnimListEl
 static int acf_filldrivers_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_DRIVERS_COLLAPSED;
                
                default: /* unsupported */
@@ -1072,10 +1072,10 @@ static int acf_filldrivers_setting_flag(bAnimContext *UNUSED(ac), int setting, s
 /* get pointer to the setting */
 static void *acf_filldrivers_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       AnimData *adt= (AnimData *)ale->data;
+       AnimData *adt = (AnimData *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1089,20 +1089,20 @@ static void *acf_filldrivers_setting_ptr(bAnimListElem *ale, int setting, short
 /* drivers expander type define */
 static bAnimChannelType ACF_FILLDRIVERS = 
 {
-       "Drivers Filler",                               /* type name */
+       "Drivers Filler",               /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_filldrivers_name,                   /* name */
-       NULL,                                                   /* name prop */
-       acf_filldrivers_icon,                   /* icon */
-       
-       acf_filldrivers_setting_valid,  /* has setting */
-       acf_filldrivers_setting_flag,   /* flag for setting */
-       acf_filldrivers_setting_ptr             /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_filldrivers_name,           /* name */
+       NULL,                           /* name prop */
+       acf_filldrivers_icon,           /* icon */
+
+       acf_filldrivers_setting_valid,  /* has setting */
+       acf_filldrivers_setting_flag,   /* flag for setting */
+       acf_filldrivers_setting_ptr     /* pointer for setting */
 };
 
 
@@ -1118,7 +1118,7 @@ static int acf_dsmat_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1128,7 +1128,7 @@ static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1142,10 +1142,10 @@ static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dsmat_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Material *ma= (Material *)ale->data;
+       Material *ma = (Material *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1165,22 +1165,22 @@ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* material expander type define */
-static bAnimChannelType ACF_DSMAT
+static bAnimChannelType ACF_DSMAT =
 {
-       "Material Data Expander",               /* type name */
+       "Material Data Expander",       /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsmat_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsmat_setting_flag,                                 /* flag for setting */
-       acf_dsmat_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsmat_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsmat_setting_flag,                 /* flag for setting */
+       acf_dsmat_setting_ptr                   /* pointer for setting */
 };
 
 /* Lamp Expander  ------------------------------------------- */
@@ -1195,7 +1195,7 @@ static int acf_dslam_icon(bAnimListElem *UNUSED(ale))
 static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1205,7 +1205,7 @@ static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1219,10 +1219,10 @@ static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dslam_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Lamp *la= (Lamp *)ale->data;
+       Lamp *la = (Lamp *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1242,22 +1242,22 @@ static void *acf_dslam_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* lamp expander type define */
-static bAnimChannelType ACF_DSLAM
+static bAnimChannelType ACF_DSLAM =
 {
-       "Lamp Expander",                                /* type name */
+       "Lamp Expander",                /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dslam_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dslam_setting_flag,                                 /* flag for setting */
-       acf_dslam_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dslam_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dslam_setting_flag,                 /* flag for setting */
+       acf_dslam_setting_ptr                   /* pointer for setting */
 };
 
 /* Texture Expander  ------------------------------------------- */
@@ -1279,7 +1279,7 @@ static short acf_dstex_offset(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(al
 static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1289,7 +1289,7 @@ static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1303,10 +1303,10 @@ static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dstex_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Tex *tex= (Tex *)ale->data;
+       Tex *tex = (Tex *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1326,22 +1326,22 @@ static void *acf_dstex_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* texture expander type define */
-static bAnimChannelType ACF_DSTEX
+static bAnimChannelType ACF_DSTEX =
 {
-       "Texture Data Expander",                /* type name */
+       "Texture Data Expander",        /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_dstex_offset,                               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idfill_nameprop,    /* name prop */
-       acf_dstex_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dstex_setting_flag,                                 /* flag for setting */
-       acf_dstex_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_dstex_offset,               /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idfill_nameprop,    /* name prop */
+       acf_dstex_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dstex_setting_flag,                 /* flag for setting */
+       acf_dstex_setting_ptr                   /* pointer for setting */
 };
 
 /* Camera Expander  ------------------------------------------- */
@@ -1356,7 +1356,7 @@ static int acf_dscam_icon(bAnimListElem *UNUSED(ale))
 static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1366,7 +1366,7 @@ static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1380,10 +1380,10 @@ static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dscam_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Camera *ca= (Camera *)ale->data;
+       Camera *ca = (Camera *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1403,22 +1403,22 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* camera expander type define */
-static bAnimChannelType ACF_DSCAM
+static bAnimChannelType ACF_DSCAM =
 {
-       "Camera Expander",                              /* type name */
+       "Camera Expander",              /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idfill_nameprop,    /* name prop */
-       acf_dscam_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dscam_setting_flag,                                 /* flag for setting */
-       acf_dscam_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idfill_nameprop,    /* name prop */
+       acf_dscam_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dscam_setting_flag,                 /* flag for setting */
+       acf_dscam_setting_ptr                   /* pointer for setting */
 };
 
 /* Curve Expander  ------------------------------------------- */
@@ -1426,8 +1426,8 @@ static bAnimChannelType ACF_DSCAM=
 // TODO: just get this from RNA?
 static int acf_dscur_icon(bAnimListElem *ale)
 {
-       Curve *cu= (Curve *)ale->data;
-       short obtype= BKE_curve_type_get(cu);
+       Curve *cu = (Curve *)ale->data;
+       short obtype = BKE_curve_type_get(cu);
        
        switch (obtype) {
                case OB_FONT:
@@ -1443,7 +1443,7 @@ static int acf_dscur_icon(bAnimListElem *ale)
 static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1453,7 +1453,7 @@ static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1467,10 +1467,10 @@ static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dscur_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Curve *cu= (Curve *)ale->data;
+       Curve *cu = (Curve *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1490,22 +1490,22 @@ static void *acf_dscur_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* curve expander type define */
-static bAnimChannelType ACF_DSCUR
+static bAnimChannelType ACF_DSCUR =
 {
-       "Curve Expander",                               /* type name */
+       "Curve Expander",               /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dscur_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dscur_setting_flag,                                 /* flag for setting */
-       acf_dscur_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dscur_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dscur_setting_flag,                 /* flag for setting */
+       acf_dscur_setting_ptr                   /* pointer for setting */
 };
 
 /* Shape Key Expander  ------------------------------------------- */
@@ -1520,7 +1520,7 @@ static int acf_dsskey_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1530,7 +1530,7 @@ static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1544,10 +1544,10 @@ static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_dsskey_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Key *key= (Key *)ale->data;
+       Key *key = (Key *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1567,22 +1567,22 @@ static void *acf_dsskey_setting_ptr(bAnimListElem *ale, int setting, short *type
 }
 
 /* shapekey expander type define */
-static bAnimChannelType ACF_DSSKEY
+static bAnimChannelType ACF_DSSKEY =
 {
-       "Shape Key Expander",                   /* type name */
+       "Shape Key Expander",           /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsskey_icon,                                /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsskey_setting_flag,                                /* flag for setting */
-       acf_dsskey_setting_ptr                                  /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsskey_icon,                /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsskey_setting_flag,                /* flag for setting */
+       acf_dsskey_setting_ptr                  /* pointer for setting */
 };
 
 /* World Expander  ------------------------------------------- */
@@ -1597,7 +1597,7 @@ static int acf_dswor_icon(bAnimListElem *UNUSED(ale))
 static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1607,7 +1607,7 @@ static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1621,10 +1621,10 @@ static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dswor_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       World *wo= (World *)ale->data;
+       World *wo = (World *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1644,22 +1644,22 @@ static void *acf_dswor_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* world expander type define */
-static bAnimChannelType ACF_DSWOR
+static bAnimChannelType ACF_DSWOR =
 {
-       "World Expander",                               /* type name */
+       "World Expander",               /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idfill_nameprop,    /* name prop */
-       acf_dswor_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dswor_setting_flag,                                 /* flag for setting */
-       acf_dswor_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idfill_nameprop,    /* name prop */
+       acf_dswor_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dswor_setting_flag,                 /* flag for setting */
+       acf_dswor_setting_ptr                   /* pointer for setting */
 };
 
 /* Particle Expander  ------------------------------------------- */
@@ -1674,7 +1674,7 @@ static int acf_dspart_icon(bAnimListElem *UNUSED(ale))
 static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1684,7 +1684,7 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1698,10 +1698,10 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_dspart_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       ParticleSettings *part= (ParticleSettings *)ale->data;
+       ParticleSettings *part = (ParticleSettings *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1721,22 +1721,22 @@ static void *acf_dspart_setting_ptr(bAnimListElem *ale, int setting, short *type
 }
 
 /* particle expander type define */
-static bAnimChannelType ACF_DSPART
+static bAnimChannelType ACF_DSPART =
 {
-       "Particle Data Expander",               /* type name */
+       "Particle Data Expander",       /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dspart_icon,                                /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dspart_setting_flag,                                /* flag for setting */
-       acf_dspart_setting_ptr                                  /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dspart_icon,                /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dspart_setting_flag,                /* flag for setting */
+       acf_dspart_setting_ptr                  /* pointer for setting */
 };
 
 /* MetaBall Expander  ------------------------------------------- */
@@ -1751,7 +1751,7 @@ static int acf_dsmball_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1761,7 +1761,7 @@ static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1775,10 +1775,10 @@ static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_dsmball_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       MetaBall *mb= (MetaBall *)ale->data;
+       MetaBall *mb = (MetaBall *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1798,22 +1798,22 @@ static void *acf_dsmball_setting_ptr(bAnimListElem *ale, int setting, short *typ
 }
 
 /* metaball expander type define */
-static bAnimChannelType ACF_DSMBALL
+static bAnimChannelType ACF_DSMBALL =
 {
-       "Metaball Expander",                    /* type name */
+       "Metaball Expander",            /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsmball_icon,                               /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsmball_setting_flag,                               /* flag for setting */
-       acf_dsmball_setting_ptr                                 /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsmball_icon,               /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsmball_setting_flag,               /* flag for setting */
+       acf_dsmball_setting_ptr                 /* pointer for setting */
 };
 
 /* Armature Expander  ------------------------------------------- */
@@ -1828,7 +1828,7 @@ static int acf_dsarm_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1838,7 +1838,7 @@ static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1852,10 +1852,10 @@ static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dsarm_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       bArmature *arm= (bArmature *)ale->data;
+       bArmature *arm = (bArmature *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1875,22 +1875,22 @@ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* metaball expander type define */
-static bAnimChannelType ACF_DSARM
+static bAnimChannelType ACF_DSARM =
 {
-       "Armature Expander",                    /* type name */
-       
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
+       "Armature Expander",            /* type name */
        
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsarm_icon,                         /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsarm_setting_flag,                                 /* flag for setting */
-       acf_dsarm_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsarm_icon,             /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsarm_setting_flag,                 /* flag for setting */
+       acf_dsarm_setting_ptr                   /* pointer for setting */
 };
 
 /* NodeTree Expander  ------------------------------------------- */
@@ -1905,7 +1905,7 @@ static int acf_dsntree_icon(bAnimListElem *UNUSED(ale))
 static short acf_dsntree_offset(bAnimContext *ac, bAnimListElem *ale)
 {
        bNodeTree *ntree = (bNodeTree *)ale->data;
-       short offset= acf_generic_basic_offset(ac, ale);
+       short offset = acf_generic_basic_offset(ac, ale);
        
        offset += acf_nodetree_rootType_offset(ntree); 
        
@@ -1916,7 +1916,7 @@ static short acf_dsntree_offset(bAnimContext *ac, bAnimListElem *ale)
 static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1926,7 +1926,7 @@ static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -1940,10 +1940,10 @@ static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       bNodeTree *ntree= (bNodeTree *)ale->data;
+       bNodeTree *ntree = (bNodeTree *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -1954,8 +1954,8 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *typ
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
                        if (ntree->adt)
                                return GET_ACF_FLAG_PTR(ntree->adt->flag, type);
-                               else
-                                       return NULL;
+                       else
+                               return NULL;
                        
                default: /* unsupported */
                        return NULL;
@@ -1963,22 +1963,22 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *typ
 }
 
 /* node tree expander type define */
-static bAnimChannelType ACF_DSNTREE
+static bAnimChannelType ACF_DSNTREE =
 {
-       "Node Tree Expander",                   /* type name */
+       "Node Tree Expander",           /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_dsntree_offset,                             /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsntree_icon,                               /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsntree_setting_flag,                               /* flag for setting */
-       acf_dsntree_setting_ptr                                 /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_dsntree_offset,             /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsntree_icon,               /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsntree_setting_flag,               /* flag for setting */
+       acf_dsntree_setting_ptr                 /* pointer for setting */
 };
 
 /* Mesh Expander  ------------------------------------------- */
@@ -1993,7 +1993,7 @@ static int acf_dsmesh_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2003,7 +2003,7 @@ static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2017,10 +2017,10 @@ static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 /* get pointer to the setting */
 static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Mesh *me= (Mesh *)ale->data;
+       Mesh *me = (Mesh *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2031,8 +2031,8 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
                        if (me->adt)
                                return GET_ACF_FLAG_PTR(me->adt->flag, type);
-                               else
-                                       return NULL;
+                       else
+                               return NULL;
                        
                default: /* unsupported */
                        return NULL;
@@ -2040,22 +2040,22 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type
 }
 
 /* node tree expander type define */
-static bAnimChannelType ACF_DSMESH
+static bAnimChannelType ACF_DSMESH =
 {
-       "Mesh Expander",                                /* type name */
-       
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */              // XXX this only works for compositing
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsmesh_icon,                                /* icon */
+       "Mesh Expander",                /* type name */
        
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsmesh_setting_flag,                                /* flag for setting */
-       acf_dsmesh_setting_ptr                                  /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */      // XXX this only works for compositing
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsmesh_icon,                /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsmesh_setting_flag,                /* flag for setting */
+       acf_dsmesh_setting_ptr                  /* pointer for setting */
 };
 
 /* Lattice Expander  ------------------------------------------- */
@@ -2070,7 +2070,7 @@ static int acf_dslat_icon(bAnimListElem *UNUSED(ale))
 static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2080,7 +2080,7 @@ static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                        
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                        
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2094,10 +2094,10 @@ static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Lattice *lt= (Lattice *)ale->data;
+       Lattice *lt = (Lattice *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2108,8 +2108,8 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type)
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
                        if (lt->adt)
                                return GET_ACF_FLAG_PTR(lt->adt->flag, type);
-                               else
-                                       return NULL;
+                       else
+                               return NULL;
                        
                default: /* unsupported */
                        return NULL;
@@ -2117,22 +2117,22 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* node tree expander type define */
-static bAnimChannelType ACF_DSLAT
+static bAnimChannelType ACF_DSLAT =
 {
-       "Lattice Expander",                             /* type name */
+       "Lattice Expander",             /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */              // XXX this only works for compositing
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dslat_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dslat_setting_flag,                                 /* flag for setting */
-       acf_dslat_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */      // XXX this only works for compositing
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dslat_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dslat_setting_flag,                 /* flag for setting */
+       acf_dslat_setting_ptr                   /* pointer for setting */
 };
 
 /* Speaker Expander  ------------------------------------------- */
@@ -2147,7 +2147,7 @@ static int acf_dsspk_icon(bAnimListElem *UNUSED(ale))
 static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
 
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2157,7 +2157,7 @@ static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
                        return ADT_NLA_EVAL_OFF;
                
                case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */
-                       *neg= 1;
+                       *neg = 1;
                        return ADT_CURVES_NOT_VISIBLE;
                
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2171,10 +2171,10 @@ static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short *
 /* get pointer to the setting */
 static void *acf_dsspk_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       Speaker *spk= (Speaker *)ale->data;
+       Speaker *spk = (Speaker *)ale->data;
 
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
 
        switch (setting) {
                case ACHANNEL_SETTING_EXPAND: /* expanded */
@@ -2194,22 +2194,22 @@ static void *acf_dsspk_setting_ptr(bAnimListElem *ale, int setting, short *type)
 }
 
 /* speaker expander type define */
-static bAnimChannelType ACF_DSSPK=
+static bAnimChannelType ACF_DSSPK =
 {
-       "Speaker Expander",                             /* type name */
+       "Speaker Expander",             /* type name */
        
-       acf_generic_dataexpand_color,   /* backdrop color */
-       acf_generic_dataexpand_backdrop,/* backdrop */
-       acf_generic_indention_1,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idblock_nameprop,   /* name prop */
-       acf_dsspk_icon,                                 /* icon */
-       
-       acf_generic_dataexpand_setting_valid,   /* has setting */
-       acf_dsspk_setting_flag,                                 /* flag for setting */
-       acf_dsspk_setting_ptr                                   /* pointer for setting */
+       acf_generic_dataexpand_color,   /* backdrop color */
+       acf_generic_dataexpand_backdrop, /* backdrop */
+       acf_generic_indention_1,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idblock_nameprop,   /* name prop */
+       acf_dsspk_icon,                 /* icon */
+
+       acf_generic_dataexpand_setting_valid,   /* has setting */
+       acf_dsspk_setting_flag,                 /* flag for setting */
+       acf_dsspk_setting_ptr                   /* pointer for setting */
 };
 
 /* ShapeKey Entry  ------------------------------------------- */
@@ -2217,7 +2217,7 @@ static bAnimChannelType ACF_DSSPK=
 /* name for ShapeKey */
 static void acf_shapekey_name(bAnimListElem *ale, char *name)
 {
-       KeyBlock *kb= (KeyBlock *)ale->data;
+       KeyBlock *kb = (KeyBlock *)ale->data;
        
        /* just copy the name... */
        if (kb && name) {
@@ -2232,7 +2232,7 @@ static void acf_shapekey_name(bAnimListElem *ale, char *name)
 /* name property for ShapeKey entries */
 static short acf_shapekey_nameprop(bAnimListElem *ale, PointerRNA *ptr, PropertyRNA **prop)
 {
-       KeyBlock *kb= (KeyBlock *)ale->data;
+       KeyBlock *kb = (KeyBlock *)ale->data;
        
        /* if the KeyBlock had a name, use it, otherwise use the index */
        if (kb && kb->name[0]) {
@@ -2264,7 +2264,7 @@ static short acf_shapekey_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem
 static int acf_shapekey_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_MUTE: /* mute */
@@ -2284,10 +2284,10 @@ static int acf_shapekey_setting_flag(bAnimContext *UNUSED(ac), int setting, shor
 /* get pointer to the setting */
 static void *acf_shapekey_setting_ptr(bAnimListElem *ale, int setting, short *type)
 {
-       KeyBlock *kb= (KeyBlock *)ale->data;
+       KeyBlock *kb = (KeyBlock *)ale->data;
        
        /* clear extra return data first */
-       *type= 0;
+       *type = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2301,22 +2301,22 @@ static void *acf_shapekey_setting_ptr(bAnimListElem *ale, int setting, short *ty
 }
 
 /* shapekey expander type define */
-static bAnimChannelType ACF_SHAPEKEY
+static bAnimChannelType ACF_SHAPEKEY =
 {
-       "Shape Key",                                    /* type name */
+       "Shape Key",                    /* type name */
        
-       acf_generic_channel_color,              /* backdrop color */
-       acf_generic_channel_backdrop,   /* backdrop */
-       acf_generic_indention_0,                /* indent level */
-       acf_generic_basic_offset,               /* offset */
-       
-       acf_shapekey_name,                              /* name */
-       acf_shapekey_nameprop,                  /* name prop */
-       NULL,                                                   /* icon */
-       
-       acf_shapekey_setting_valid,             /* has setting */
-       acf_shapekey_setting_flag,              /* flag for setting */
-       acf_shapekey_setting_ptr                /* pointer for setting */
+       acf_generic_channel_color,      /* backdrop color */
+       acf_generic_channel_backdrop,   /* backdrop */
+       acf_generic_indention_0,        /* indent level */
+       acf_generic_basic_offset,       /* offset */
+
+       acf_shapekey_name,              /* name */
+       acf_shapekey_nameprop,          /* name prop */
+       NULL,                           /* icon */
+
+       acf_shapekey_setting_valid,     /* has setting */
+       acf_shapekey_setting_flag,      /* flag for setting */
+       acf_shapekey_setting_ptr        /* pointer for setting */
 };
 
 /* GPencil Datablock ------------------------------------------- */
@@ -2352,7 +2352,7 @@ static short acf_gpd_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUS
 static int acf_gpd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2369,7 +2369,7 @@ static int acf_gpd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *ne
 /* get pointer to the setting */
 static void *acf_gpd_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
 {
-       bGPdata *gpd= (bGPdata *)ale->data;
+       bGPdata *gpd = (bGPdata *)ale->data;
        
        /* all flags are just in gpd->flag for now... */
        return GET_ACF_FLAG_PTR(gpd->flag, type);
@@ -2378,20 +2378,20 @@ static void *acf_gpd_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short
 /* gpencil datablock type define */
 static bAnimChannelType ACF_GPD = 
 {
-       "GPencil Datablock",                    /* type name */
-       
-       acf_gpd_color,                                  /* backdrop color */
-       acf_group_backdrop,                             /* backdrop */
-       acf_generic_indention_0,                /* indent level */
-       acf_generic_group_offset,               /* offset */
+       "GPencil Datablock",            /* type name */
        
-       acf_generic_idblock_name,               /* name */
-       acf_generic_idfill_nameprop,    /* name prop */
-       acf_gpd_icon,                                   /* icon */
-       
-       acf_gpd_setting_valid,                  /* has setting */
-       acf_gpd_setting_flag,                   /* flag for setting */
-       acf_gpd_setting_ptr                             /* pointer for setting */
+       acf_gpd_color,                  /* backdrop color */
+       acf_group_backdrop,             /* backdrop */
+       acf_generic_indention_0,        /* indent level */
+       acf_generic_group_offset,       /* offset */
+
+       acf_generic_idblock_name,       /* name */
+       acf_generic_idfill_nameprop,    /* name prop */
+       acf_gpd_icon,                   /* icon */
+
+       acf_gpd_setting_valid,          /* has setting */
+       acf_gpd_setting_flag,           /* flag for setting */
+       acf_gpd_setting_ptr             /* pointer for setting */
 };
 
 /* GPencil Layer ------------------------------------------- */
@@ -2437,7 +2437,7 @@ static short acf_gpl_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUS
 static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
 {
        /* clear extra return data first */
-       *neg= 0;
+       *neg = 0;
        
        switch (setting) {
                case ACHANNEL_SETTING_SELECT: /* selected */
@@ -2458,7 +2458,7 @@ static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), int setting, short *ne
 /* get pointer to the setting */
 static void *acf_gpl_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
 {
-       bGPDlayer *gpl= (bGPDlayer *)ale->data;
+       bGPDlayer *gpl = (bGPDlayer *)ale->data;
        
        /* all flags are just in agrp->flag for now... */
        return GET_ACF_FLAG_PTR(gpl->flag, type);
@@ -2467,20 +2467,20 @@ static void *acf_gpl_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short
 /* grease pencil layer type define */
 static bAnimChannelType ACF_GPL = 
 {
-       "GPencil Layer",                                /* type name */
-       
-       acf_generic_channel_color,              /* backdrop color */
-       acf_generic_channel_backdrop,   /* backdrop */
-       acf_generic_indention_flexible, /* indent level */
-       acf_generic_group_offset,               /* offset */
-       
-       acf_gpl_name,                                   /* name */
-       acf_gpl_name_prop,                              /* name prop */
-       NULL,                                                   /* icon */
+       "GPencil Layer",                /* type name */
        
-       acf_gpl_setting_valid,                  /* has setting */
-       acf_gpl_setting_flag,                   /* flag for setting */
-       acf_gpl_setting_ptr                             /* pointer for setting */
+       acf_generic_channel_color,      /* backdrop color */
+       acf_generic_channel_backdrop,   /* backdrop */
+       acf_generic_indention_flexible, /* indent level */
+       acf_generic_group_offset,       /* offset */
+
+       acf_gpl_name,                   /* name */
+       acf_gpl_name_prop,              /* name prop */
+       NULL,                           /* icon */
+
+       acf_gpl_setting_valid,          /* has setting */
+       acf_gpl_setting_flag,           /* flag for setting */
+       acf_gpl_setting_ptr             /* pointer for setting */
 };
 
 /* *********************************************** */
@@ -2488,60 +2488,60 @@ static bAnimChannelType ACF_GPL =
 
 /* These globals only ever get directly accessed in this file */
 static bAnimChannelType *animchannelTypeInfo[ANIMTYPE_NUM_TYPES];
-static short ACF_INIT= 1; /* when non-zero, the list needs to be updated */
+static short ACF_INIT = 1; /* when non-zero, the list needs to be updated */
 
 /* Initialize type info definitions */
-static void ANIM_init_channel_typeinfo_data (void)
+static void ANIM_init_channel_typeinfo_data(void)
 {
-       int type= 0;
+       int type = 0;
        
        /* start initializing if necessary... */
        if (ACF_INIT) {
-               ACF_INIT= 0;
-               
-               animchannelTypeInfo[type++]= NULL;                              /* None */
-               animchannelTypeInfo[type++]= NULL;                              /* AnimData */
-               animchannelTypeInfo[type++]= NULL;                              /* Special */
-               
-               animchannelTypeInfo[type++]= &ACF_SUMMARY;              /* Motion Summary */
-               
-               animchannelTypeInfo[type++]= &ACF_SCENE;                /* Scene */
-               animchannelTypeInfo[type++]= &ACF_OBJECT;               /* Object */
-               animchannelTypeInfo[type++]= &ACF_GROUP;                /* Group */
-               animchannelTypeInfo[type++]= &ACF_FCURVE;               /* F-Curve */
-               
-               animchannelTypeInfo[type++]= &ACF_FILLACTD;     /* Object Action Expander */
-               animchannelTypeInfo[type++]= &ACF_FILLDRIVERS;  /* Drivers Expander */
-               
-               animchannelTypeInfo[type++]= &ACF_DSMAT;                /* Material Channel */
-               animchannelTypeInfo[type++]= &ACF_DSLAM;                /* Lamp Channel */
-               animchannelTypeInfo[type++]= &ACF_DSCAM;                /* Camera Channel */
-               animchannelTypeInfo[type++]= &ACF_DSCUR;                /* Curve Channel */
-               animchannelTypeInfo[type++]= &ACF_DSSKEY;               /* ShapeKey Channel */
-               animchannelTypeInfo[type++]= &ACF_DSWOR;                /* World Channel */
-               animchannelTypeInfo[type++]= &ACF_DSNTREE;              /* NodeTree Channel */
-               animchannelTypeInfo[type++]= &ACF_DSPART;               /* Particle Channel */
-               animchannelTypeInfo[type++]= &ACF_DSMBALL;              /* MetaBall Channel */
-               animchannelTypeInfo[type++]= &ACF_DSARM;                /* Armature Channel */
-               animchannelTypeInfo[type++]= &ACF_DSMESH;               /* Mesh Channel */
-               animchannelTypeInfo[type++]= &ACF_DSTEX;                /* Texture Channel */
-               animchannelTypeInfo[type++]= &ACF_DSLAT;                /* Lattice Channel */
-               animchannelTypeInfo[type++]= &ACF_DSSPK;                /* Speaker Channel */
-               
-               animchannelTypeInfo[type++]= &ACF_SHAPEKEY;             /* ShapeKey */
-               
-               animchannelTypeInfo[type++]= &ACF_GPD;                  /* Grease Pencil Datablock */ 
-               animchannelTypeInfo[type++]= &ACF_GPL;                  /* Grease Pencil Layer */ 
-               
-                       // TODO: these types still need to be implemented!!!
-                       // probably need a few extra flags for these special cases...
-               animchannelTypeInfo[type++]= NULL;                              /* NLA Track */ 
-               animchannelTypeInfo[type++]= NULL;                              /* NLA Action */ 
+               ACF_INIT = 0;
+               
+               animchannelTypeInfo[type++] = NULL;              /* None */
+               animchannelTypeInfo[type++] = NULL;              /* AnimData */
+               animchannelTypeInfo[type++] = NULL;              /* Special */
+
+               animchannelTypeInfo[type++] = &ACF_SUMMARY;      /* Motion Summary */
+
+               animchannelTypeInfo[type++] = &ACF_SCENE;        /* Scene */
+               animchannelTypeInfo[type++] = &ACF_OBJECT;       /* Object */
+               animchannelTypeInfo[type++] = &ACF_GROUP;        /* Group */
+               animchannelTypeInfo[type++] = &ACF_FCURVE;       /* F-Curve */
+
+               animchannelTypeInfo[type++] = &ACF_FILLACTD;     /* Object Action Expander */
+               animchannelTypeInfo[type++] = &ACF_FILLDRIVERS;  /* Drivers Expander */
+
+               animchannelTypeInfo[type++] = &ACF_DSMAT;        /* Material Channel */
+               animchannelTypeInfo[type++] = &ACF_DSLAM;        /* Lamp Channel */
+               animchannelTypeInfo[type++] = &ACF_DSCAM;        /* Camera Channel */
+               animchannelTypeInfo[type++] = &ACF_DSCUR;        /* Curve Channel */
+               animchannelTypeInfo[type++] = &ACF_DSSKEY;       /* ShapeKey Channel */
+               animchannelTypeInfo[type++] = &ACF_DSWOR;        /* World Channel */
+               animchannelTypeInfo[type++] = &ACF_DSNTREE;      /* NodeTree Channel */
+               animchannelTypeInfo[type++] = &ACF_DSPART;       /* Particle Channel */
+               animchannelTypeInfo[type++] = &ACF_DSMBALL;      /* MetaBall Channel */
+               animchannelTypeInfo[type++] = &ACF_DSARM;        /* Armature Channel */
+               animchannelTypeInfo[type++] = &ACF_DSMESH;       /* Mesh Channel */
+               animchannelTypeInfo[type++] = &ACF_DSTEX;        /* Texture Channel */
+               animchannelTypeInfo[type++] = &ACF_DSLAT;        /* Lattice Channel */
+               animchannelTypeInfo[type++] = &ACF_DSSPK;        /* Speaker Channel */
+
+               animchannelTypeInfo[type++] = &ACF_SHAPEKEY;     /* ShapeKey */
+
+               animchannelTypeInfo[type++] = &ACF_GPD;          /* Grease Pencil Datablock */
+               animchannelTypeInfo[type++] = &ACF_GPL;          /* Grease Pencil Layer */
+
+               // TODO: these types still need to be implemented!!!
+               // probably need a few extra flags for these special cases...
+               animchannelTypeInfo[type++] = NULL;              /* NLA Track */
+               animchannelTypeInfo[type++] = NULL;              /* NLA Action */
        }
 } 
 
 /* Get type info from given channel type */
-bAnimChannelType *ANIM_channel_get_typeinfo (bAnimListElem *ale)
+bAnimChannelType *ANIM_channel_get_typeinfo(bAnimListElem *ale)
 {
        /* santiy checks */
        if (ale == NULL)
@@ -2562,7 +2562,7 @@ bAnimChannelType *ANIM_channel_get_typeinfo (bAnimListElem *ale)
 /* Print debug info string for the given channel */
 void ANIM_channel_debug_print_info(bAnimListElem *ale, short indent_level)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        
        /* print indents */
        for (; indent_level > 0; indent_level--)
@@ -2594,7 +2594,7 @@ void ANIM_channel_debug_print_info(bAnimListElem *ale, short indent_level)
  */
 short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        
        /* 1) check that the setting exists for the current context */
        if ((acf) && (!acf->has_setting || acf->has_setting(ac, ale, setting))) {
@@ -2603,44 +2603,44 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
                int flag;
                void *ptr;
                
-               flag= acf->setting_flag(ac, setting, &negflag);
-               ptr= acf->setting_ptr(ale, setting, &ptrsize);
+               flag = acf->setting_flag(ac, setting, &negflag);
+               ptr = acf->setting_ptr(ale, setting, &ptrsize);
                
                /* check if flag is enabled */
                if (ptr && flag) {
                        switch (ptrsize) {
-                               case sizeof(int):       /* integer pointer for setting */
+                               case sizeof(int):   /* integer pointer for setting */
                                {
-                                       int *val= (int *)ptr;
+                                       int *val = (int *)ptr;
                                        
                                        if (negflag)
                                                return ((*val) & flag) == 0;
                                        else
                                                return ((*val) & flag) != 0;
                                }
-                                       break;
+                               break;
                                        
-                               case sizeof(short):     /* short pointer for setting */
+                               case sizeof(short): /* short pointer for setting */
                                {
-                                       short *val= (short *)ptr;
+                                       short *val = (short *)ptr;
                                        
                                        if (negflag)
                                                return ((*val) & flag) == 0;
                                        else
                                                return ((*val) & flag) != 0;
                                }
-                                       break;
+                               break;
                                        
-                               case sizeof(char):      /* char pointer for setting */
+                               case sizeof(char):  /* char pointer for setting */
                                {
-                                       char *val= (char *)ptr;
+                                       char *val = (char *)ptr;
                                        
                                        if (negflag)
                                                return ((*val) & flag) == 0;
                                        else
                                                return ((*val) & flag) != 0;
                                }
-                                       break;
+                               break;
                        }
                }
        }
@@ -2652,17 +2652,17 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
 
 /* quick macro for use in ANIM_channel_setting_set - set flag for setting according the mode given */
 #define ACF_SETTING_SET(sval, sflag, smode) \
-       {\
-               if (negflag) {\
-                       if (smode == ACHANNEL_SETFLAG_INVERT)   (sval) ^= (sflag); \
+       { \
+               if (negflag) { \
+                       if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \
                        else if (smode == ACHANNEL_SETFLAG_ADD) (sval) &= ~(sflag); \
-                       else                                                                    (sval) |= (sflag); \
+                       else (sval) |= (sflag); \
                } \
-               else {\
-                       if (smode == ACHANNEL_SETFLAG_INVERT)   (sval) ^= (sflag); \
+               else { \
+                       if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \
                        else if (smode == ACHANNEL_SETFLAG_ADD) (sval) |= (sflag); \
-                       else                                                                    (sval) &= ~(sflag); \
-               }\
+                       else (sval) &= ~(sflag); \
+               } \
        }
 
 /* Change value of some setting for a channel 
@@ -2671,7 +2671,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
  */
 void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting, short mode)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        
        /* 1) check that the setting exists for the current context */
        if ((acf) && (!acf->has_setting || acf->has_setting(ac, ale, setting))) {
@@ -2680,32 +2680,32 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting,
                int flag;
                void *ptr;
                
-               flag= acf->setting_flag(ac, setting, &negflag);
-               ptr= acf->setting_ptr(ale, setting, &ptrsize);
+               flag = acf->setting_flag(ac, setting, &negflag);
+               ptr = acf->setting_ptr(ale, setting, &ptrsize);
                
                /* check if flag is enabled */
                if (ptr && flag) {
                        switch (ptrsize) {
-                               case sizeof(int):       /* integer pointer for setting */
+                               case sizeof(int):   /* integer pointer for setting */
                                {
-                                       int *val= (int *)ptr;
+                                       int *val = (int *)ptr;
                                        ACF_SETTING_SET(*val, flag, mode);
                                }
-                                       break;
+                               break;
                                        
-                               case sizeof(short):     /* short pointer for setting */
+                               case sizeof(short): /* short pointer for setting */
                                {
-                                       short *val= (short *)ptr;
+                                       short *val = (short *)ptr;
                                        ACF_SETTING_SET(*val, flag, mode);
                                }
-                                       break;
+                               break;
                                        
-                               case sizeof(char):      /* char pointer for setting */
+                               case sizeof(char):  /* char pointer for setting */
                                {
-                                       char *val= (char *)ptr;
+                                       char *val = (char *)ptr;
                                        ACF_SETTING_SET(*val, flag, mode);
                                }
-                                       break;
+                               break;
                        }
                }
        }
@@ -2714,9 +2714,9 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting,
 /* --------------------------- */
 
 // XXX hardcoded size of icons
-#define ICON_WIDTH             17
+#define ICON_WIDTH      17
 // XXX hardcoded width of sliders
-#define SLIDER_WIDTH   80
+#define SLIDER_WIDTH    80
 // XXX hardcoded width of rename textboxes
 #define RENAME_TEXT_WIDTH 100
 
@@ -2724,8 +2724,8 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting,
 // TODO: make this use UI controls for the buttons
 void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
        short selected, offset;
        float y, ymid, ytext;
        
@@ -2735,23 +2735,23 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
        
        /* get initial offset */
        if (acf->get_offset)
-               offset= acf->get_offset(ac, ale);
+               offset = acf->get_offset(ac, ale);
        else
-               offset= 0;
+               offset = 0;
                
        /* calculate appropriate y-coordinates for icon buttons 
         *      7 is hardcoded factor for half-height of icons
         */
-       y= (ymaxc - yminc)/2 + yminc;
-       ymid= y - 7;
+       y = (ymaxc - yminc) / 2 + yminc;
+       ymid = y - 7;
        /* y-coordinates for text is only 4 down from middle */
-       ytext= y - 4;
+       ytext = y - 4;
        
        /* check if channel is selected */
        if (acf->has_setting(ac, ale, ACHANNEL_SETTING_SELECT))
-               selected= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT);
+               selected = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT);
        else
-               selected= 0;
+               selected = 0;
                
        /* set blending again, as may not be set in previous step */
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -2784,7 +2784,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
                if ((ac->spacetype == SPACE_IPO) && acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE)) {
                        /* for F-Curves, draw color-preview of curve behind checkbox */
                        if (ale->type == ANIMTYPE_FCURVE) {
-                               FCurve *fcu= (FCurve *)ale->data;
+                               FCurve *fcu = (FCurve *)ale->data;
                                
                                /* F-Curve channels need to have a special 'color code' box drawn, which is colored with whatever 
                                 * color the curve has stored 
@@ -2792,10 +2792,10 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
                                glColor3fv(fcu->color);
                                
                                /* just a solid color rect
-                                *      hardcoded 17 pixels width is slightly wider than icon width, so that 
+                                *  hardcoded 17 pixels width is slightly wider than icon width, so that
                                 *      there's a slight border around it 
                                 */
-                               glRectf(offset, yminc, offset+17, ymaxc);
+                               glRectf(offset, yminc, offset + 17, ymaxc);
                        }
                        
                        /* icon is drawn as widget now... */
@@ -2830,8 +2830,8 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
                        // FIXME: replace hardcoded color here, and check on extents!
                        glColor3f(1.0f, 0.0f, 0.0f);
                        glLineWidth(2.0);
-                               fdrawline((float)(offset), yminc, 
-                                                 (float)(v2d->cur.xmax), yminc);
+                       fdrawline((float)(offset), yminc,
+                                 (float)(v2d->cur.xmax), yminc);
                        glLineWidth(1.0);
                }
        }
@@ -2855,21 +2855,21 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
                        switch (ac->spacetype) {
                                case SPACE_ACTION:
                                {
-                                       SpaceAction *saction= (SpaceAction *)ac->sl;
-                                       draw_sliders= (saction->flag & SACTION_SLIDERS);
+                                       SpaceAction *saction = (SpaceAction *)ac->sl;
+                                       draw_sliders = (saction->flag & SACTION_SLIDERS);
                                }
-                                       break;
+                               break;
                                case SPACE_IPO:
                                {
-                                       SpaceIpo *sipo= (SpaceIpo *)ac->sl;
-                                       draw_sliders= (sipo->flag & SIPO_SLIDERS);
+                                       SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+                                       draw_sliders = (sipo->flag & SIPO_SLIDERS);
                                }
-                                       break;
+                               break;
                        }
                }
                
                /* 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) ) {
+               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;
@@ -2893,7 +2893,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
                 *      - starts from the point where the first toggle/slider starts, 
                 *      - ends past the space that might be reserved for a scroller
                 */
-               glRectf(v2d->cur.xmax-(float)offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc);
+               glRectf(v2d->cur.xmax - (float)offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc);
        }
 }
 
@@ -2902,13 +2902,13 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 /* callback for (normal) widget settings - send notifiers */
 static void achannel_setting_widget_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
 {
-       WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 }
 
 /* callback for widget settings that need flushing */
 static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void *setting_wrap)
 {
-       bAnimListElem *ale_setting= (bAnimListElem *)ale_npoin;
+       bAnimListElem *ale_setting = (bAnimListElem *)ale_npoin;
        bAnimContext ac;
        ListBase anim_data = {NULL, NULL};
        int filter;
@@ -2916,7 +2916,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
        short on = 0;
        
        /* send notifiers before doing anything else... */
-       WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        /* verify animation context */
        if (ANIM_animdata_get_context(C, &ac) == 0)
@@ -2925,7 +2925,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
        /* verify that we have a channel to operate on, and that it has all we need */
        if (ale_setting) {
                /* check if the setting is on... */
-               on= ANIM_channel_setting_get(&ac, ale_setting, setting);
+               on = ANIM_channel_setting_get(&ac, ale_setting, setting);
                
                /* on == -1 means setting not found... */
                if (on == -1)
@@ -2935,7 +2935,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
                return;
        
        /* get all channels that can possibly be chosen - but ignore hierarchy */
-       filter= ANIMFILTER_DATA_VISIBLE|ANIMFILTER_LIST_CHANNELS;
+       filter = ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS;
        ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
        
        /* call API method to flush the setting */
@@ -2955,25 +2955,25 @@ static void achannel_setting_rename_done_cb(bContext *C, void *ads_poin, void *U
        
        /* send notifiers */
        // XXX: right notifier?
-       WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_RENAME, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_RENAME, NULL);
 }
 
 /* callback for widget sliders - insert keyframes */
 static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poin)
 {
-       ID *id= (ID *)id_poin;
-       FCurve *fcu= (FCurve *)fcu_poin;
+       ID *id = (ID *)id_poin;
+       FCurve *fcu = (FCurve *)fcu_poin;
        
        ReportList *reports = CTX_wm_reports(C);
-       Scene *scene= CTX_data_scene(C);
+       Scene *scene = CTX_data_scene(C);
        PointerRNA id_ptr, ptr;
        PropertyRNA *prop;
-       short flag=0, done=0;
+       short flag = 0, done = 0;
        float cfra;
        
        /* get current frame */
        // NOTE: this will do for now...
-       cfra= (float)CFRA;
+       cfra = (float)CFRA;
        
        /* get flags for keyframing */
        flag = ANIM_get_keyframing_flags(scene, 1);
@@ -2988,30 +2988,30 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi
                        flag |= INSERTKEY_REPLACE;
                
                /* insert a keyframe for this F-Curve */
-               done= insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag);
+               done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag);
                
                if (done)
-                       WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
+                       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        }
 }
 
 /* callback for shapekey widget sliders - insert keyframes */
 static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, void *kb_poin)
 {
-       Key *key= (Key *)key_poin;
-       KeyBlock *kb= (KeyBlock *)kb_poin;
-       char *rna_path= key_get_curValue_rnaPath(key, kb);
+       Key *key = (Key *)key_poin;
+       KeyBlock *kb = (KeyBlock *)kb_poin;
+       char *rna_path = key_get_curValue_rnaPath(key, kb);
        
        ReportList *reports = CTX_wm_reports(C);
-       Scene *scene= CTX_data_scene(C);
+       Scene *scene = CTX_data_scene(C);
        PointerRNA id_ptr, ptr;
        PropertyRNA *prop;
-       short flag=0, done=0;
+       short flag = 0, done = 0;
        float cfra;
        
        /* get current frame */
        // NOTE: this will do for now...
-       cfra= (float)CFRA;
+       cfra = (float)CFRA;
        
        /* get flags for keyframing */
        flag = ANIM_get_keyframing_flags(scene, 1);
@@ -3023,18 +3023,18 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi
        if (RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop)) {
                /* find or create new F-Curve */
                // XXX is the group name for this ok?
-               bAction *act= verify_adt_action((ID *)key, 1);
-               FCurve *fcu= verify_fcurve(act, NULL, rna_path, 0, 1);
+               bAction *act = verify_adt_action((ID *)key, 1);
+               FCurve *fcu = verify_fcurve(act, NULL, rna_path, 0, 1);
                
                /* set the special 'replace' flag if on a keyframe */
                if (fcurve_frame_has_keyframe(fcu, cfra, 0))
                        flag |= INSERTKEY_REPLACE;
                
                /* insert a keyframe for this F-Curve */
-               done= insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag);
+               done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag);
                
                if (done)
-                       WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL);
+                       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        }
        
        /* free the path */
@@ -3053,32 +3053,32 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
        uiBut *but = NULL;
        
        /* get the flag and the pointer to that flag */
-       flag= acf->setting_flag(ac, setting, &negflag);
-       ptr= acf->setting_ptr(ale, setting, &ptrsize);
+       flag = acf->setting_flag(ac, setting, &negflag);
+       ptr = acf->setting_ptr(ale, setting, &ptrsize);
        /* enabled= ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */
        
        /* get the base icon for the setting */
        switch (setting) {
-               case ACHANNEL_SETTING_VISIBLE:  /* visibility eyes */
+               case ACHANNEL_SETTING_VISIBLE:  /* visibility eyes */
                        //icon= ((enabled)? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
-                       icon= ICON_VISIBLE_IPO_OFF;
+                       icon = ICON_VISIBLE_IPO_OFF;
                        
                        if (ale->type == ANIMTYPE_FCURVE)
-                               tooltip= "Channel is visible in Graph Editor for editing";
+                               tooltip = "Channel is visible in Graph Editor for editing";
                        else
-                               tooltip= "Channel(s) are visible in Graph Editor for editing";
+                               tooltip = "Channel(s) are visible in Graph Editor for editing";
                        break;
                        
                case ACHANNEL_SETTING_EXPAND: /* expanded triangle */
                        //icon= ((enabled)? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
-                       icon= ICON_TRIA_RIGHT;
-                       tooltip= "Make channels grouped under this channel visible";
+                       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= ICON_LAYER_USED;
-                       tooltip= "NLA Track is the only one evaluated for the AnimData block it belongs to";
+                       icon = ICON_LAYER_USED;
+                       tooltip = "NLA Track is the only one evaluated for the AnimData block it belongs to";
                        break;
                
                /* --- */
@@ -3086,48 +3086,48 @@ 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= ICON_UNLOCKED;
-                       tooltip= "Editability of keyframes for this channel";
+                       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= ICON_MUTE_IPO_OFF;
+                       icon = ICON_MUTE_IPO_OFF;
                        
                        if (ale->type == ALE_FCURVE) 
-                               tooltip= "Does F-Curve contribute to result";
+                               tooltip = "Does F-Curve contribute to result";
                        else
-                               tooltip= "Do channels contribute to result";
+                               tooltip = "Do channels contribute to result";
                        break;
                        
                default:
-                       tooltip= NULL;
-                       icon= 0;
+                       tooltip = NULL;
+                       icon = 0;
                        break;
        }
        
        /* type of button */
        if (negflag)
-               butType= ICONTOGN;
+               butType = ICONTOGN;
        else
-               butType= ICONTOG;
+               butType = ICONTOG;
        
        /* draw button for setting */
        if (ptr && flag) {
                switch (ptrsize) {
-                       case sizeof(int):       /* integer pointer for setting */
+                       case sizeof(int):   /* integer pointer for setting */
                                but = uiDefIconButBitI(block, butType, flag, 0, icon, 
-                                               xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
+                                                      xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
                                break;
                                
-                       case sizeof(short):     /* short pointer for setting */
+                       case sizeof(short): /* short pointer for setting */
                                but = uiDefIconButBitS(block, butType, flag, 0, icon, 
-                                               xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
+                                                      xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
                                break;
                                
-                       case sizeof(char):      /* char pointer for setting */
+                       case sizeof(char):  /* char pointer for setting */
                                but = uiDefIconButBitC(block, butType, flag, 0, icon, 
-                                               xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
+                                                      xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip);
                                break;
                }
                
@@ -3153,9 +3153,9 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
 /* Draw UI widgets the given channel */
 void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale, uiBlock *block, float yminc, float ymaxc, size_t channel_index)
 {
-       bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale);
-       View2D *v2d= &ac->ar->v2d;
-       float y, ymid/*, ytext*/;
+       bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
+       View2D *v2d = &ac->ar->v2d;
+       float y, ymid /*, ytext*/;
        short offset;
        
        /* sanity checks - don't draw anything */
@@ -3164,15 +3164,15 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
        
        /* get initial offset */
        if (acf->get_offset)
-               offset= acf->get_offset(ac, ale);
+               offset = acf->get_offset(ac, ale);
        else
-               offset= 0;
+               offset = 0;
                
        /* calculate appropriate y-coordinates for icon buttons 
         *      7 is hardcoded factor for half-height of icons
         */
-       y= (ymaxc - yminc)/2 + yminc;
-       ymid= y - 7;
+       y = (ymaxc - yminc) / 2 + yminc;
+       ymid = y - 7;
        /* y-coordinates for text is only 4 down from middle */
        /* ytext= y - 4; */
        
@@ -3213,7 +3213,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
                float channel_height = ymaxc - yminc;
                
                /* if rename index matches, add widget for this */
-               if (ac->ads->renameIndex == channel_index+1) {
+               if (ac->ads->renameIndex == channel_index + 1) {
                        PointerRNA ptr;
                        PropertyRNA *prop;
                        
@@ -3223,7 +3223,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
                                
                                uiBlockSetEmboss(block, UI_EMBOSS);
                                
-                               but = uiDefButR(block, TEX, 1, "", offset+3, yminc, RENAME_TEXT_WIDTH, channel_height,
+                               but = uiDefButR(block, TEX, 1, "", offset + 3, yminc, RENAME_TEXT_WIDTH, channel_height,
                                                &ptr, RNA_property_identifier(prop), -1, 0, 0, -1, -1, NULL);
                                uiButSetFunc(but, achannel_setting_rename_done_cb, ac->ads, NULL);
                                uiButActiveOnly(C, block, but);
@@ -3247,30 +3247,30 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
                        switch (ac->spacetype) {
                                case SPACE_ACTION:
                                {
-                                       SpaceAction *saction= (SpaceAction *)ac->sl;
-                                       draw_sliders= (saction->flag & SACTION_SLIDERS);
+                                       SpaceAction *saction = (SpaceAction *)ac->sl;
+                                       draw_sliders = (saction->flag & SACTION_SLIDERS);
                                }
-                                       break;
+                               break;
                                case SPACE_IPO:
                                {
-                                       SpaceIpo *sipo= (SpaceIpo *)ac->sl;
-                                       draw_sliders= (sipo->flag & SIPO_SLIDERS);
+                                       SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+                                       draw_sliders = (sipo->flag & SIPO_SLIDERS);
                                }
-                                       break;
+                               break;
                        }
                }
                
                /* 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) ) {
+               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);
+                               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_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax - offset, ymid, ACHANNEL_SETTING_MUTE);
                        }
                }
                
@@ -3299,17 +3299,17 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
                                
                                /* get destination info */
                                if (ale->type == ANIMTYPE_FCURVE) {
-                                       FCurve *fcu= (FCurve *)ale->data;
+                                       FCurve *fcu = (FCurve *)ale->data;
                                        
-                                       rna_path= fcu->rna_path;
-                                       array_index= fcu->array_index;
+                                       rna_path = fcu->rna_path;
+                                       array_index = fcu->array_index;
                                }
                                else if (ale->type == ANIMTYPE_SHAPEKEY) {
-                                       KeyBlock *kb= (KeyBlock *)ale->data;
-                                       Key *key= (Key *)ale->id;
+                                       KeyBlock *kb = (KeyBlock *)ale->data;
+                                       Key *key = (Key *)ale->id;
                                        
-                                       rna_path= key_get_curValue_rnaPath(key, kb);
-                                       free_path= 1;
+                                       rna_path = key_get_curValue_rnaPath(key, kb);
+                                       free_path = 1;
                                }
                                
                                /* only if RNA-Path found */
@@ -3322,7 +3322,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
                                                uiBut *but;
                                                
                                                /* create the slider button, and assign relevant callback to ensure keyframes are inserted... */
-                                               but = uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NONE, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc);
+                                               but = uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NONE, (int)v2d->cur.xmax - offset, ymid, SLIDER_WIDTH, (int)ymaxc - yminc);
                                                
                                                /* assign keyframing function according to slider type */
                                                if (ale->type == ANIMTYPE_SHAPEKEY)
index 9b46729b489ec0e51f4fdc085dcd3578f05b222d..24cae5d8652b47950f9feafe2fc553a144c2f64a 100644 (file)
 
 // XXX! --------------------------------
 /* temporary definition for limits of float number buttons (FLT_MAX tends to infinity with old system) */
-#define UI_FLT_MAX     10000.0f
+#define UI_FLT_MAX  10000.0f
 
-#define B_REDR                                         1
-#define B_FMODIFIER_REDRAW             20
+#define B_REDR                  1
+#define B_FMODIFIER_REDRAW      20
 
 /* macro for use here to draw background box and set height */
 // XXX for now, roundbox has it's callback func set to NULL to not intercept events
 #define DRAW_BACKDROP(height) \
        { \
-               uiDefBut(block, ROUNDBOX, B_REDR, "", -3, yco-height, width+3, height-1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); \
+               uiDefBut(block, ROUNDBOX, B_REDR, "", -3, yco - height, width + 3, height - 1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); \
        }
 
 /* callback to verify modifier data */
-static void validate_fmodifier_cb (bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg))
+static void validate_fmodifier_cb(bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg))
 {
-       FModifier *fcm= (FModifier *)fcm_v;
-       FModifierTypeInfo *fmi= fmodifier_get_typeinfo(fcm);
+       FModifier *fcm = (FModifier *)fcm_v;
+       FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
        
        /* call the verify callback on the modifier if applicable */
        if (fmi && fmi->verify_data)
@@ -93,10 +93,10 @@ static void validate_fmodifier_cb (bContext *UNUSED(C), void *fcm_v, void *UNUSE
 }
 
 /* callback to remove the given modifier  */
-static void delete_fmodifier_cb (bContext *C, void *fmods_v, void *fcm_v)
+static void delete_fmodifier_cb(bContext *C, void *fmods_v, void *fcm_v)
 {
        ListBase *modifiers = (ListBase *)fmods_v;
-       FModifier *fcm= (FModifier *)fcm_v;
+       FModifier *fcm = (FModifier *)fcm_v;
        
        /* remove the given F-Modifier from the active modifier-stack */
        remove_fmodifier(modifiers, fcm);
@@ -105,7 +105,7 @@ static void delete_fmodifier_cb (bContext *C, void *fmods_v, void *fcm_v)
        
        /* send notifiers */
        // XXX for now, this is the only way to get updates in all the right places... but would be nice to have a special one in this case 
-       WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+       WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 }
 
 /* --------------- */
@@ -113,7 +113,7 @@ static void delete_fmodifier_cb (bContext *C, void *fmods_v, void *fcm_v)
 /* draw settings for generator modifier */
 static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, short width)
 {
-       FMod_Generator *data= (FMod_Generator *)fcm->data;
+       FMod_Generator *data = (FMod_Generator *)fcm->data;
        uiLayout /* *col, */ /* UNUSED */ *row;
        uiBlock *block;
        uiBut *but;
@@ -124,12 +124,12 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
        
        /* basic settings (backdrop + mode selector + some padding) */
        /* col= uiLayoutColumn(layout, 1); */ /* UNUSED */
-       block= uiLayoutGetBlock(layout);
+       block = uiLayoutGetBlock(layout);
        uiBlockBeginAlign(block);
-               but = uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL);
-               uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
+       but = uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width - 30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL);
+       uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
                
-               uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL);
+       uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width - 30, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL);
        uiBlockEndAlign(block);
        
        /* now add settings for individual modes */
@@ -141,20 +141,20 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
                        unsigned int i;
                        
                        /* draw polynomial order selector */
-                       row= uiLayoutRow(layout, 0);
-                       block= uiLayoutGetBlock(row);
-                               but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 10, 0, width-30, 19,
-                                              &data->poly_order, 1, 100, 0, 0,
-                                              TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
-                               uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
+                       row = uiLayoutRow(layout, 0);
+                       block = uiLayoutGetBlock(row);
+                       but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 10, 0, width - 30, 19,
+                                       &data->poly_order, 1, 100, 0, 0,
+                                       TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
+                       uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
                        
                        
                        /* draw controls for each coefficient and a + sign at end of row */
-                       row= uiLayoutRow(layout, 1);
-                       block= uiLayoutGetBlock(row);
+                       row = uiLayoutRow(layout, 1);
+                       block = uiLayoutGetBlock(row);
                        
-                       cp= data->coefficients;
-                       for (i=0; (i < data->arraysize) && (cp); i++, cp++) {
+                       cp = data->coefficients;
+                       for (i = 0; (i < data->arraysize) && (cp); i++, cp++) {
                                /* To align with first line */
                                if (i)
                                        uiDefBut(block, LABEL, 1, "   ", 0, 0, 50, 20, NULL, 0.0, 0.0, 0, 0, "");
@@ -173,12 +173,12 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
                                        sprintf(xval, "x^%u", i);
                                uiDefBut(block, LABEL, 1, xval, 0, 0, 50, 20, NULL, 0.0, 0.0, 0, 0, TIP_("Power of x"));
                                
-                               if ( (i != (data->arraysize - 1)) || ((i==0) && data->arraysize==2) ) {
+                               if ( (i != (data->arraysize - 1)) || ((i == 0) && data->arraysize == 2) ) {
                                        uiDefBut(block, LABEL, 1, "+", 0, 0, 30, 20, NULL, 0.0, 0.0, 0, 0, "");
                                        
                                        /* next coefficient on a new row */
-                                       row= uiLayoutRow(layout, 1);
-                                       block= uiLayoutGetBlock(row);
+                                       row = uiLayoutRow(layout, 1);
+                                       block = uiLayoutGetBlock(row);
                                }
                                else {
                                        /* For alignement in UI! */
@@ -194,20 +194,20 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
                        unsigned int i;
                        
                        /* draw polynomial order selector */
-                       row= uiLayoutRow(layout, 0);
-                       block= uiLayoutGetBlock(row);
-                               but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0, 0, width-30, 19,
-                                              &data->poly_order, 1, 100, 0, 0,
-                                              TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
-                               uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
+                       row = uiLayoutRow(layout, 0);
+                       block = uiLayoutGetBlock(row);
+                       but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0, 0, width - 30, 19,
+                                       &data->poly_order, 1, 100, 0, 0,
+                                       TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
+                       uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
                        
                        
                        /* draw controls for each pair of coefficients */
-                       row= uiLayoutRow(layout, 1);
-                       block= uiLayoutGetBlock(row);
+                       row = uiLayoutRow(layout, 1);
+                       block = uiLayoutGetBlock(row);
                        
-                       cp= data->coefficients;
-                       for (i=0; (i < data->poly_order) && (cp); i++, cp+=2) {
+                       cp = data->coefficients;
+                       for (i = 0; (i < data->poly_order) && (cp); i++, cp += 2) {
                                /* To align with first line */
                                if (i)
                                        uiDefBut(block, LABEL, 1, "   ", 0, 0, 50, 20, NULL, 0.0, 0.0, 0, 0, "");
@@ -222,22 +222,22 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
                                
                                uiDefBut(block, LABEL, 1, "x +", 0, 0, 40, 20, NULL, 0.0, 0.0, 0, 0, "");
                                
-                               uiDefButF(block, NUM, B_FMODIFIER_REDRAW, "", 0, 0, 100, 20, cp+1, -UI_FLT_MAX, UI_FLT_MAX,
+                               uiDefButF(block, NUM, B_FMODIFIER_REDRAW, "", 0, 0, 100, 20, cp + 1, -UI_FLT_MAX, UI_FLT_MAX,
                                          10, 3, TIP_("Second coefficient"));
                                
                                /* closing bracket and '+' sign */
-                               if ( (i != (data->poly_order - 1)) || ((i==0) && data->poly_order==2) ) {
+                               if ( (i != (data->poly_order - 1)) || ((i == 0) && data->poly_order == 2) ) {
                                        uiDefBut(block, LABEL, 1, ") +", 0, 0, 30, 20, NULL, 0.0, 0.0, 0, 0, "");
                                        
                                        /* set up new row for the next pair of coefficients*/
-                                       row= uiLayoutRow(layout, 1);
-                                       block= uiLayoutGetBlock(row);
+                                       row = uiLayoutRow(layout, 1);
+                                       block = uiLayoutGetBlock(row);
                                }
                                else 
                                        uiDefBut(block, LABEL, 1, ")", 0, 0, 20, 20, NULL, 0.0, 0.0, 0, 0, "");
                        }
                }
-                       break;
+               break;
        }
 }
 
@@ -253,15 +253,15 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm
        RNA_pointer_create(id, &RNA_FModifierFunctionGenerator, fcm, &ptr);
        
        /* add the settings */
-       col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "function_type", 0, "", ICON_NONE);
-               uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
-       
-       col= uiLayoutColumn(layout, 0); // no grouping for now
-               uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "value_offset", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(layout, 1);
+       uiItemR(col, &ptr, "function_type", 0, "", ICON_NONE);
+       uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
+
+       col = uiLayoutColumn(layout, 0); // no grouping for now
+       uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "value_offset", 0, NULL, ICON_NONE);
 }
 
 /* --------------- */
@@ -278,19 +278,19 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor
        /* split into 2 columns 
         * NOTE: the mode comboboxes shouldn't get labels, otherwise there isn't enough room
         */
-       split= uiLayoutSplit(layout, 0.5f, 0);
+       split = uiLayoutSplit(layout, 0.5f, 0);
        
        /* before range */
-       col= uiLayoutColumn(split, 1);
-               uiItemL(col, IFACE_("Before:"), ICON_NONE);
-               uiItemR(col, &ptr, "mode_before", 0, "", ICON_NONE);
-               uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(split, 1);
+       uiItemL(col, IFACE_("Before:"), ICON_NONE);
+       uiItemR(col, &ptr, "mode_before", 0, "", ICON_NONE);
+       uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NONE);
                
        /* after range */
-       col= uiLayoutColumn(split, 1);
-               uiItemL(col, IFACE_("After:"), ICON_NONE);
-               uiItemR(col, &ptr, "mode_after", 0, "", ICON_NONE);
-               uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(split, 1);
+       uiItemL(col, IFACE_("After:"), ICON_NONE);
+       uiItemR(col, &ptr, "mode_after", 0, "", ICON_NONE);
+       uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NONE);
 }
 
 /* --------------- */
@@ -308,33 +308,33 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short
        uiItemR(layout, &ptr, "blend_type", 0, NULL, ICON_NONE);
        
        /* split into 2 columns */
-       split= uiLayoutSplit(layout, 0.5f, 0);
+       split = uiLayoutSplit(layout, 0.5f, 0);
        
        /* col 1 */
-       col= uiLayoutColumn(split, 0);
-               uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(split, 0);
+       uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
        
        /* col 2 */
-       col= uiLayoutColumn(split, 0);
-               uiItemR(col, &ptr, "phase", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "depth", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(split, 0);
+       uiItemR(col, &ptr, "phase", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "depth", 0, NULL, ICON_NONE);
 }
 
 /* --------------- */
 
-#define BINARYSEARCH_FRAMEEQ_THRESH    0.0001f
+#define BINARYSEARCH_FRAMEEQ_THRESH 0.0001f
 
 /* Binary search algorithm for finding where to insert Envelope Data Point.
  * Returns the index to insert at (data already at that index will be offset if replace is 0)
  */
-static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float frame, int arraylen, short *exists)
+static int binarysearch_fcm_envelopedata_index(FCM_EnvelopeData array[], float frame, int arraylen, short *exists)
 {
-       int start=0, end=arraylen;
-       int loopbreaker= 0, maxloop= arraylen * 2;
+       int start = 0, end = arraylen;
+       int loopbreaker = 0, maxloop = arraylen * 2;
        
        /* initialize exists-flag first */
-       *exists= 0;
+       *exists = 0;
        
        /* sneaky optimisations (don't go through searching process if...):
         *      - keyframe to be added is to be added out of current bounds
@@ -349,7 +349,7 @@ static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float
                float framenum;
                
                /* 'First' Point (when only one point, this case is used) */
-               framenum= array[0].time;
+               framenum = array[0].time;
                if (IS_EQT(frame, framenum, BINARYSEARCH_FRAMEEQ_THRESH)) {
                        *exists = 1;
                        return 0;
@@ -358,9 +358,9 @@ static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float
                        return 0;
                        
                /* 'Last' Point */
-               framenum= array[(arraylen-1)].time;
+               framenum = array[(arraylen - 1)].time;
                if (IS_EQT(frame, framenum, BINARYSEARCH_FRAMEEQ_THRESH)) {
-                       *exists= 1;
+                       *exists = 1;
                        return (arraylen - 1);
                }
                else if (frame > framenum)
@@ -369,12 +369,12 @@ static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float
        
        
        /* most of the time, this loop is just to find where to put it
-        *      - 'loopbreaker' is just here to prevent infinite loops 
+        *  - 'loopbreaker' is just here to prevent infinite loops
         */
-       for (loopbreaker=0; (start <= end) && (loopbreaker < maxloop); loopbreaker++) {
+       for (loopbreaker = 0; (start <= end) && (loopbreaker < maxloop); loopbreaker++) {
                /* compute and get midpoint */
-               int mid = start + ((end - start) / 2);  /* we calculate the midpoint this way to avoid int overflows... */
-               float midfra= array[mid].time;
+               int mid = start + ((end - start) / 2);  /* we calculate the midpoint this way to avoid int overflows... */
+               float midfra = array[mid].time;
                
                /* check if exactly equal to midpoint */
                if (IS_EQT(frame, midfra, BINARYSEARCH_FRAMEEQ_THRESH)) {
@@ -384,13 +384,13 @@ static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float
                
                /* repeat in upper/lower half */
                if (frame > midfra)
-                       start= mid + 1;
+                       start = mid + 1;
                else if (frame < midfra)
-                       end= mid - 1;
+                       end = mid - 1;
        }
        
        /* print error if loop-limit exceeded */
-       if (loopbreaker == (maxloop-1)) {
+       if (loopbreaker == (maxloop - 1)) {
                printf("Error: binarysearch_fcm_envelopedata_index() was taking too long\n");
                
                // include debug info 
@@ -403,91 +403,91 @@ static int binarysearch_fcm_envelopedata_index (FCM_EnvelopeData array[], float
 
 /* callback to add new envelope data point */
 // TODO: should we have a separate file for things like this?
-static void fmod_envelope_addpoint_cb (bContext *C, void *fcm_dv, void *UNUSED(arg))
+static void fmod_envelope_addpoint_cb(bContext *C, void *fcm_dv, void *UNUSED(arg))
 {
-       Scene *scene= CTX_data_scene(C);
-       FMod_Envelope *env= (FMod_Envelope *)fcm_dv;
+       Scene *scene = CTX_data_scene(C);
+       FMod_Envelope *env = (FMod_Envelope *)fcm_dv;
        FCM_EnvelopeData *fedn;
        FCM_EnvelopeData fed;
        
        /* init template data */
-       fed.min= -1.0f;
-       fed.max= 1.0f;
-       fed.time= (float)scene->r.cfra; // XXX make this int for ease of use?
-       fed.f1= fed.f2= 0;
+       fed.min = -1.0f;
+       fed.max = 1.0f;
+       fed.time = (float)scene->r.cfra; // XXX make this int for ease of use?
+       fed.f1 = fed.f2 = 0;
        
        /* check that no data exists for the current frame... */
        if (env->data) {
                short exists = -1;
-               int i= binarysearch_fcm_envelopedata_index(env->data, (float)(scene->r.cfra), env->totvert, &exists);
+               int i = binarysearch_fcm_envelopedata_index(env->data, (float)(scene->r.cfra), env->totvert, &exists);
                
                /* binarysearch_...() will set exists by default to 0, so if it is non-zero, that means that the point exists already */
                if (exists)
                        return;
                        
                /* add new */
-               fedn= MEM_callocN((env->totvert+1)*sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
+               fedn = MEM_callocN((env->totvert + 1) * sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
                
                /* add the points that should occur before the point to be pasted */
                if (i > 0)
-                       memcpy(fedn, env->data, i*sizeof(FCM_EnvelopeData));
+                       memcpy(fedn, env->data, i * sizeof(FCM_EnvelopeData));
                
                /* add point to paste at index i */
-               *(fedn + i)= fed;
+               *(fedn + i) = fed;
                
                /* add the points that occur after the point to be pasted */
                if (i < env->totvert) 
-                       memcpy(fedn+i+1, env->data+i, (env->totvert-i)*sizeof(FCM_EnvelopeData));
+                       memcpy(fedn + i + 1, env->data + i, (env->totvert - i) * sizeof(FCM_EnvelopeData));
                
                /* replace (+ free) old with new */
                MEM_freeN(env->data);
-               env->data= fedn;
+               env->data = fedn;
                
                env->totvert++;
        }
        else {
-               env->data= MEM_callocN(sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
-               *(env->data)= fed;
+               env->data = MEM_callocN(sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
+               *(env->data) = fed;
                
-               env->totvert= 1;
+               env->totvert = 1;
        }
 }
 
 /* callback to remove envelope data point */
 // TODO: should we have a separate file for things like this?
-static void fmod_envelope_deletepoint_cb (bContext *UNUSED(C), void *fcm_dv, void *ind_v)
+static void fmod_envelope_deletepoint_cb(bContext *UNUSED(C), void *fcm_dv, void *ind_v)
 {
-       FMod_Envelope *env= (FMod_Envelope *)fcm_dv;
+       FMod_Envelope *env = (FMod_Envelope *)fcm_dv;
        FCM_EnvelopeData *fedn;
-       int index= GET_INT_FROM_POINTER(ind_v);
+       int index = GET_INT_FROM_POINTER(ind_v);
        
        /* check that no data exists for the current frame... */
        if (env->totvert > 1) {
                /* allocate a new smaller array */
-               fedn= MEM_callocN(sizeof(FCM_EnvelopeData)*(env->totvert-1), "FCM_EnvelopeData");
+               fedn = MEM_callocN(sizeof(FCM_EnvelopeData) * (env->totvert - 1), "FCM_EnvelopeData");
 
-               memcpy(fedn, env->data, sizeof(FCM_EnvelopeData)*(index));
-               memcpy(fedn + index, env->data + (index + 1), sizeof(FCM_EnvelopeData)*((env->totvert - index)-1));
+               memcpy(fedn, env->data, sizeof(FCM_EnvelopeData) * (index));
+               memcpy(fedn + index, env->data + (index + 1), sizeof(FCM_EnvelopeData) * ((env->totvert - index) - 1));
                
                /* free old array, and set the new */
                MEM_freeN(env->data);
-               env->data= fedn;
+               env->data = fedn;
                env->totvert--;
        }
        else {
                /* just free array, since the only vert was deleted */
                if (env->data) {
                        MEM_freeN(env->data);
-                       env->data= NULL;
+                       env->data = NULL;
                }
-               env->totvert= 0;
+               env->totvert = 0;
        }
 }
 
 /* draw settings for envelope modifier */
 static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, short UNUSED(width))
 {
-       FMod_Envelope *env= (FMod_Envelope *)fcm->data;
+       FMod_Envelope *env = (FMod_Envelope *)fcm->data;
        FCM_EnvelopeData *fed;
        uiLayout *col, *row;
        uiBlock *block;
@@ -499,45 +499,45 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh
        RNA_pointer_create(id, &RNA_FModifierEnvelope, fcm, &ptr);
        
        /* general settings */
-       col= uiLayoutColumn(layout, 1);
-               uiItemL(col, IFACE_("Envelope:"), ICON_NONE);
-               uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NONE);
-               
-               row= uiLayoutRow(col, 1);
-                       uiItemR(row, &ptr, "default_min", 0, IFACE_("Min"), ICON_NONE);
-                       uiItemR(row, &ptr, "default_max", 0, IFACE_("Max"), ICON_NONE);
+       col = uiLayoutColumn(layout, 1);
+       uiItemL(col, IFACE_("Envelope:"), ICON_NONE);
+       uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NONE);
+
+       row = uiLayoutRow(col, 1);
+       uiItemR(row, &ptr, "default_min", 0, IFACE_("Min"), ICON_NONE);
+       uiItemR(row, &ptr, "default_max", 0, IFACE_("Max"), ICON_NONE);
                        
        /* control points header */
        // TODO: move this control-point control stuff to using the new special widgets for lists
        // the current way is far too cramped
-       row= uiLayoutRow(layout, 0);
-       block= uiLayoutGetBlock(row);
+       row = uiLayoutRow(layout, 0);
+       block = uiLayoutGetBlock(row);
                
-               uiDefBut(block, LABEL, 1, IFACE_("Control Points:"), 0, 0, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
+       uiDefBut(block, LABEL, 1, IFACE_("Control Points:"), 0, 0, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
                
-               but = uiDefBut(block, BUT, B_FMODIFIER_REDRAW, IFACE_("Add Point"), 0, 0, 150, 19,
-                             NULL, 0, 0, 0, 0, TIP_("Add a new control-point to the envelope on the current frame"));
-               uiButSetFunc(but, fmod_envelope_addpoint_cb, env, NULL);
+       but = uiDefBut(block, BUT, B_FMODIFIER_REDRAW, IFACE_("Add Point"), 0, 0, 150, 19,
+                      NULL, 0, 0, 0, 0, TIP_("Add a new control-point to the envelope on the current frame"));
+       uiButSetFunc(but, fmod_envelope_addpoint_cb, env, NULL);
                
        /* control points list */
-       for (i=0, fed=env->data; i < env->totvert; i++, fed++) {
+       for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
                /* get a new row to operate on */
-               row= uiLayoutRow(layout, 1);
-               block= uiLayoutGetBlock(row);
+               row = uiLayoutRow(layout, 1);
+               block = uiLayoutGetBlock(row);
                
                uiBlockBeginAlign(block);
-                       but=uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Fra:"), 0, 0, 90, 20,
-                                     &fed->time, -MAXFRAMEF, MAXFRAMEF, 10, 1, TIP_("Frame that envelope point occurs"));
-                       uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
-                       
-                       uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Min:"), 0, 0, 100, 20,
-                                 &fed->min, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Minimum bound of envelope at this point"));
-                       uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Max:"), 0, 0, 100, 20,
-                                 &fed->max, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Maximum bound of envelope at this point"));
+               but = uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Fra:"), 0, 0, 90, 20,
+                               &fed->time, -MAXFRAMEF, MAXFRAMEF, 10, 1, TIP_("Frame that envelope point occurs"));
+               uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
                        
-                       but = uiDefIconBut(block, BUT, B_FMODIFIER_REDRAW, ICON_X, 0, 0, 18, 20,
-                                         NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete envelope control point"));
-                       uiButSetFunc(but, fmod_envelope_deletepoint_cb, env, SET_INT_IN_POINTER(i));
+               uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Min:"), 0, 0, 100, 20,
+                         &fed->min, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Minimum bound of envelope at this point"));
+               uiDefButF(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Max:"), 0, 0, 100, 20,
+                         &fed->max, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Maximum bound of envelope at this point"));
+
+               but = uiDefIconBut(block, BUT, B_FMODIFIER_REDRAW, ICON_X, 0, 0, 18, 20,
+                                  NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete envelope control point"));
+               uiButSetFunc(but, fmod_envelope_deletepoint_cb, env, SET_INT_IN_POINTER(i));
                uiBlockBeginAlign(block);
        }
 }
@@ -558,17 +558,17 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
                /* row= uiLayoutRow(layout, 0); */ /* UNUSED */
                
                /* split into 2 columns */
-               split= uiLayoutSplit(layout, 0.5f, 0);
+               split = uiLayoutSplit(layout, 0.5f, 0);
                
                /* x-minimum */
-               col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NONE);
-                       uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NONE);
+               col = uiLayoutColumn(split, 1);
+               uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NONE);
+               uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NONE);
                        
                /* y-minimum*/
-               col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NONE);
-                       uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NONE);
+               col = uiLayoutColumn(split, 1);
+               uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NONE);
+               uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NONE);
        }
        
        /* row 2: maximum */
@@ -576,17 +576,17 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
                /* row= uiLayoutRow(layout, 0); */ /* UNUSED */
                
                /* split into 2 columns */
-               split= uiLayoutSplit(layout, 0.5f, 0);
+               split = uiLayoutSplit(layout, 0.5f, 0);
                
                /* x-minimum */
-               col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NONE);
-                       uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NONE);
+               col = uiLayoutColumn(split, 1);
+               uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NONE);
+               uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NONE);
                        
                /* y-minimum*/
-               col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NONE);
-                       uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NONE);
+               col = uiLayoutColumn(split, 1);
+               uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NONE);
+               uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NONE);
        }
 }
 
@@ -602,36 +602,36 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho
        RNA_pointer_create(id, &RNA_FModifierStepped, fcm, &ptr);
        
        /* block 1: "stepping" settings */
-       col= uiLayoutColumn(layout, 0);
-               uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NONE);
-               uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(layout, 0);
+       uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NONE);
+       uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NONE);
                
        /* block 2: start range settings */
-       col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(layout, 1);
+       uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NONE);
                
-               sub = uiLayoutColumn(col, 1);
-               uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_start"));
-                       uiItemR(sub, &ptr, "frame_start", 0, NULL, ICON_NONE);
+       sub = uiLayoutColumn(col, 1);
+       uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_start"));
+       uiItemR(sub, &ptr, "frame_start", 0, NULL, ICON_NONE);
                        
        /* block 3: end range settings */
-       col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NONE);
+       col = uiLayoutColumn(layout, 1);
+       uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NONE);
                
-               sub = uiLayoutColumn(col, 1);
-               uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_end"));
-                       uiItemR(sub, &ptr, "frame_end", 0, NULL, ICON_NONE);
+       sub = uiLayoutColumn(col, 1);
+       uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_end"));
+       uiItemR(sub, &ptr, "frame_end", 0, NULL, ICON_NONE);
 }
 
 /* --------------- */
 
 void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifiers, FModifier *fcm)
 {
-       FModifierTypeInfo *fmi= fmodifier_get_typeinfo(fcm);
+       FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
        uiLayout *box, *row, *sub, *col;
        uiBlock *block;
        uiBut *but;
-       short width= 314;
+       short width = 314;
        PointerRNA ptr;
        
        /* init the RNA-pointer */
@@ -640,13 +640,13 @@ void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifier
        /* draw header */
        {
                /* get layout-row + UI-block for this */
-               box= uiLayoutBox(layout);
+               box = uiLayoutBox(layout);
                
-               row= uiLayoutRow(box, 0);
-               block= uiLayoutGetBlock(row); // err...
+               row = uiLayoutRow(box, 0);
+               block = uiLayoutGetBlock(row); // err...
                
                /* left-align -------------------------------------------- */
-               sub= uiLayoutRow(row, 1);
+               sub = uiLayoutRow(row, 1);
                uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_LEFT);
                
                uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -664,7 +664,7 @@ void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifier
                        uiItemL(sub, "<Unknown Modifier>", ICON_NONE);
                
                /* right-align ------------------------------------------- */
-               sub= uiLayoutRow(row, 1);
+               sub = uiLayoutRow(row, 1);
                uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_RIGHT);
                
                
@@ -675,7 +675,7 @@ void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifier
                
                /* delete button */
                but = uiDefIconBut(block, BUT, B_REDR, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y,
-                                 NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete F-Curve Modifier"));
+                                  NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete F-Curve Modifier"));
                uiButSetFunc(but, delete_fmodifier_cb, modifiers, fcm);
                
                uiBlockSetEmboss(block, UI_EMBOSS);
@@ -684,7 +684,7 @@ void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifier
        /* when modifier is expanded, draw settings */
        if (fcm->flag & FMODIFIER_FLAG_EXPANDED) {
                /* set up the flexible-box layout which acts as the backdrop for the modifier settings */
-               box= uiLayoutBox(layout); 
+               box = uiLayoutBox(layout);
                
                /* draw settings for individual modifiers */
                switch (fcm->type) {
@@ -729,7 +729,7 @@ void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *id, ListBase *modifier
                        col = uiLayoutColumn(box, 1);
                        
                        /* top row: use restricted range */
-                       row= uiLayoutRow(col, 1);
+                       row = uiLayoutRow(col, 1);
                        uiItemR(row, &ptr, "use_restricted_range", 0, NULL, ICON_NONE);
                        
                        if (fcm->flag & FMODIFIER_FLAG_RANGERESTRICT) {
@@ -822,7 +822,7 @@ short ANIM_fmodifiers_paste_from_buf(ListBase *modifiers, short replace)
                free_fmodifiers(modifiers);
                
        /* now copy over all the modifiers in the buffer to the end of the list */
-       for (fcm= fmodifier_copypaste_buf.first; fcm; fcm= fcm->next) {
+       for (fcm = fmodifier_copypaste_buf.first; fcm; fcm = fcm->next) {
                /* make a copy of it */
                FModifier *fcmN = copy_fmodifier(fcm);
                
index bcd0feb36cff9cee3e59fa631c3808046c445d21..ec75ad1d07a2d99f66e860b3987e22c0a32a69a4 100644 (file)
@@ -121,14 +121,14 @@ short ANIM_get_keyframing_flags(Scene *scene, short incl_mode)
 /* Get (or add relevant data to be able to do so) the Active Action for the given 
  * Animation Data block, given an ID block where the Animation Data should reside.
  */
-bAction *verify_adt_action (ID *id, short add)
+bAction *verify_adt_action(ID *id, short add)
 {
        AnimData *adt;
        
        /* init animdata if none available yet */
-       adt= BKE_animdata_from_id(id);
+       adt = BKE_animdata_from_id(id);
        if ((adt == NULL) && (add))
-               adt= BKE_id_add_animdata(id);
+               adt = BKE_id_add_animdata(id);
        if (adt == NULL) { 
                /* if still none (as not allowed to add, or ID doesn't have animdata for some reason) */
                printf("ERROR: Couldn't add AnimData (ID = %s)\n", (id) ? (id->name) : "<None>");
@@ -138,9 +138,9 @@ bAction *verify_adt_action (ID *id, short add)
        /* init action if none available yet */
        // TODO: need some wizardry to handle NLA stuff correct
        if ((adt->action == NULL) && (add)) {
-               char actname[sizeof(id->name)-2];
-               BLI_snprintf(actname, sizeof(actname), "%sAction", id->name+2);
-               adt->action= add_empty_action(actname);
+               char actname[sizeof(id->name) - 2];
+               BLI_snprintf(actname, sizeof(actname), "%sAction", id->name + 2);
+               adt->action = add_empty_action(actname);
        }
                
        /* return the action */
@@ -150,7 +150,7 @@ bAction *verify_adt_action (ID *id, short add)
 /* Get (or add relevant data to be able to do so) F-Curve from the Active Action, 
  * for the given Animation Data block. This assumes that all the destinations are valid.
  */
-FCurve *verify_fcurve (bAction *act, const char group[], const char rna_path[], const int array_index, short add)
+FCurve *verify_fcurve(bAction *act, const char group[], const char rna_path[], const int array_index, short add)
 {
        bActionGroup *grp;
        FCurve *fcu;
@@ -164,30 +164,30 @@ FCurve *verify_fcurve (bAction *act, const char group[], const char rna_path[],
         *              TODO: add auto-grouping support? how this works will need to be resolved
         */
        if (act)
-               fcu= list_find_fcurve(&act->curves, rna_path, array_index);
+               fcu = list_find_fcurve(&act->curves, rna_path, array_index);
        else
-               fcu= NULL;
+               fcu = NULL;
        
        if ((fcu == NULL) && (add)) {
                /* use default settings to make a F-Curve */
-               fcu= MEM_callocN(sizeof(FCurve), "FCurve");
+               fcu = MEM_callocN(sizeof(FCurve), "FCurve");
                
-               fcu->flag = (FCURVE_VISIBLE|FCURVE_SELECTED);
-               if (act->curves.first==NULL) 
-                       fcu->flag |= FCURVE_ACTIVE;     /* first one added active */
+               fcu->flag = (FCURVE_VISIBLE | FCURVE_SELECTED);
+               if (act->curves.first == NULL)
+                       fcu->flag |= FCURVE_ACTIVE;  /* first one added active */
                        
                /* store path - make copy, and store that */
-               fcu->rna_path= BLI_strdupn(rna_path, strlen(rna_path));
-               fcu->array_index= array_index;
+               fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path));
+               fcu->array_index = array_index;
                
                /* if a group name has been provided, try to add or find a group, then add F-Curve to it */
                if (group) {
                        /* try to find group */
-                       grp= BKE_action_group_find_name(act, group);
+                       grp = BKE_action_group_find_name(act, group);
                        
                        /* no matching groups, so add one */
                        if (grp == NULL)
-                               grp= action_groups_add_new(act, group);
+                               grp = action_groups_add_new(act, group);
                        
                        /* add F-Curve to group */
                        action_groups_add_channel(act, grp, fcu);
@@ -212,11 +212,11 @@ FCurve *verify_fcurve (bAction *act, const char group[], const char rna_path[],
  * suitable place in chronological order.
  * 
  * NOTE: any recalculate of the F-Curve that needs to be done will need to 
- *             be done by the caller.
+ *      be done by the caller.
  */
 int insert_bezt_fcurve(FCurve *fcu, BezTriple *bezt, short flag)
 {
-       int i= 0;
+       int i = 0;
        
        /* are there already keyframes? */
        if (fcu->bezt) {
@@ -228,17 +228,17 @@ int insert_bezt_fcurve(FCurve *fcu, BezTriple *bezt, short flag)
                        /* sanity check: 'i' may in rare cases exceed arraylen */
                        if ((i >= 0) && (i < fcu->totvert)) {
                                /* just change the values when replacing, so as to not overwrite handles */
-                               BezTriple *dst= (fcu->bezt + i);
-                               float dy= bezt->vec[1][1] - dst->vec[1][1];
+                               BezTriple *dst = (fcu->bezt + i);
+                               float dy = bezt->vec[1][1] - dst->vec[1][1];
                                
                                /* just apply delta value change to the handle values */
                                dst->vec[0][1] += dy;
                                dst->vec[1][1] += dy;
                                dst->vec[2][1] += dy;
                                
-                               dst->f1= bezt->f1;
-                               dst->f2= bezt->f2;
-                               dst->f3= bezt->f3;
+                               dst->f1 = bezt->f1;
+                               dst->f2 = bezt->f2;
+                               dst->f3 = bezt->f3;
                                
                                // TODO: perform some other operations?
                        }
@@ -246,22 +246,22 @@ int insert_bezt_fcurve(FCurve *fcu, BezTriple *bezt, short flag)
                /* keyframing modes allow to not replace keyframe */
                else if ((flag & INSERTKEY_REPLACE) == 0) {
                        /* insert new - if we're not restricted to replacing keyframes only */
-                       BezTriple *newb= MEM_callocN((fcu->totvert+1)*sizeof(BezTriple), "beztriple");
+                       BezTriple *newb = MEM_callocN((fcu->totvert + 1) * sizeof(BezTriple), "beztriple");
                        
                        /* add the beztriples that should occur before the beztriple to be pasted (originally in fcu) */
                        if (i > 0)
-                               memcpy(newb, fcu->bezt, i*sizeof(BezTriple));
+                               memcpy(newb, fcu->bezt, i * sizeof(BezTriple));
                        
                        /* add beztriple to paste at index i */
-                       *(newb + i)= *bezt;
+                       *(newb + i) = *bezt;
                        
                        /* add the beztriples that occur after the beztriple to be pasted (originally in fcu) */
                        if (i < fcu->totvert) 
-                               memcpy(newb+i+1, fcu->bezt+i, (fcu->totvert-i)*sizeof(BezTriple));
+                               memcpy(newb + i + 1, fcu->bezt + i, (fcu->totvert - i) * sizeof(BezTriple));
                        
                        /* replace (+ free) old with new, only if necessary to do so */
                        MEM_freeN(fcu->bezt);
-                       fcu->bezt= newb;
+                       fcu->bezt = newb;
                        
                        fcu->totvert++;
                }
@@ -272,11 +272,11 @@ int insert_bezt_fcurve(FCurve *fcu, BezTriple *bezt, short flag)
         *              // NOTE: maybe we may want to allow this later when doing samples -> bezt conversions, 
         *              // but for now, having both is asking for trouble
         */
-       else if ((flag & INSERTKEY_REPLACE)==0 && (fcu->fpt==NULL)) {
+       else if ((flag & INSERTKEY_REPLACE) == 0 && (fcu->fpt == NULL)) {
                /* create new keyframes array */
-               fcu->bezt= MEM_callocN(sizeof(BezTriple), "beztriple");
-               *(fcu->bezt)= *bezt;
-               fcu->totvert= 1;
+               fcu->bezt = MEM_callocN(sizeof(BezTriple), "beztriple");
+               *(fcu->bezt) = *bezt;
+               fcu->totvert = 1;
        }
        /* cannot add anything */
        else {
@@ -297,25 +297,25 @@ int insert_bezt_fcurve(FCurve *fcu, BezTriple *bezt, short flag)
  */
 int insert_vert_fcurve(FCurve *fcu, float x, float y, short flag)
 {
-       BezTriple beztr= {{{0}}};
+       BezTriple beztr = {{{0}}};
        unsigned int oldTot = fcu->totvert;
        int a;
        
        /* set all three points, for nicer start position 
         * NOTE: +/- 1 on vec.x for left and right handles is so that 'free' handles work ok...
         */
-       beztr.vec[0][0]= x-1.0f; 
-       beztr.vec[0][1]= y;
-       beztr.vec[1][0]= x;
-       beztr.vec[1][1]= y;
-       beztr.vec[2][0]= x+1.0f;
-       beztr.vec[2][1]= y;
-       beztr.f1= beztr.f2= beztr.f3= SELECT;
-       beztr.h1= beztr.h2= U.keyhandles_new; /* use default handle type here */
+       beztr.vec[0][0] = x - 1.0f;
+       beztr.vec[0][1] = y;
+       beztr.vec[1][0] = x;
+       beztr.vec[1][1] = y;
+       beztr.vec[2][0] = x + 1.0f;
+       beztr.vec[2][1] = y;
+       beztr.f1 = beztr.f2 = beztr.f3 = SELECT;
+       beztr.h1 = beztr.h2 = U.keyhandles_new; /* use default handle type here */
        //BEZKEYTYPE(&beztr)= scene->keytype; /* default keyframe type */
 
        /* use default interpolation mode, with exceptions for int/discrete values */
-       beztr.ipo= U.ipo_new;
+       beztr.ipo = U.ipo_new;
 
        if (fcu->flag & FCURVE_DISCRETE_VALUES)
                beztr.ipo = BEZT_IPO_CONST;
@@ -323,7 +323,7 @@ int insert_vert_fcurve(FCurve *fcu, float x, float y, short flag)
                beztr.ipo = BEZT_IPO_LIN;
        
        /* add temp beztriple to keyframes */
-       a= insert_bezt_fcurve(fcu, &beztr, flag);
+       a = insert_bezt_fcurve(fcu, &beztr, flag);
        
        /* what if 'a' is a negative index? 
         * for now, just exit to prevent any segfaults
@@ -338,18 +338,18 @@ int insert_vert_fcurve(FCurve *fcu, float x, float y, short flag)
                calchandles_fcurve(fcu);
        
        /* set handletype and interpolation */
-       if ((fcu->totvert > 2) && (flag & INSERTKEY_REPLACE)==0) {
-               BezTriple *bezt= (fcu->bezt + a);
+       if ((fcu->totvert > 2) && (flag & INSERTKEY_REPLACE) == 0) {
+               BezTriple *bezt = (fcu->bezt + a);
                
                /* set interpolation from previous (if available), but only if we didn't just replace some keyframe 
-                *      - replacement is indicated by no-change in number of verts
+                *  - replacement is indicated by no-change in number of verts
                 *      - when replacing, the user may have specified some interpolation that should be kept
                 */
                if (fcu->totvert > oldTot) {
                        if (a > 0) 
-                               bezt->ipo= (bezt-1)->ipo;
-                       else if (a < fcu->totvert-1) 
-                               bezt->ipo= (bezt+1)->ipo;
+                               bezt->ipo = (bezt - 1)->ipo;
+                       else if (a < fcu->totvert - 1)
+                               bezt->ipo = (bezt + 1)->ipo;
                }
                        
                /* don't recalculate handles if fast is set
@@ -379,33 +379,33 @@ enum {
  *     2. Keyframe to be added on frame where two keyframes are already situated
  *     3. Keyframe lies at point that intersects the linear line between two keyframes
  */
-static short new_key_needed (FCurve *fcu, float cFrame, float nValue) 
+static short new_key_needed(FCurve *fcu, float cFrame, float nValue)
 {
-       BezTriple *bezt=NULL, *prev=NULL;
+       BezTriple *bezt = NULL, *prev = NULL;
        int totCount, i;
        float valA = 0.0f, valB = 0.0f;
        
        /* safety checking */
        if (fcu == NULL) return KEYNEEDED_JUSTADD;
-       totCount= fcu->totvert;
+       totCount = fcu->totvert;
        if (totCount == 0) return KEYNEEDED_JUSTADD;
        
        /* loop through checking if any are the same */
-       bezt= fcu->bezt;
-       for (i=0; i<totCount; i++) {
-               float prevPosi=0.0f, prevVal=0.0f;
-               float beztPosi=0.0f, beztVal=0.0f;
+       bezt = fcu->bezt;
+       for (i = 0; i < totCount; i++) {
+               float prevPosi = 0.0f, prevVal = 0.0f;
+               float beztPosi = 0.0f, beztVal = 0.0f;
                        
                /* get current time+value */    
-               beztPosi= bezt->vec[1][0];
-               beztVal= bezt->vec[1][1];
+               beztPosi = bezt->vec[1][0];
+               beztVal = bezt->vec[1][1];
                        
                if (prev) {
                        /* there is a keyframe before the one currently being examined */               
                        
                        /* get previous time+value */
-                       prevPosi= prev->vec[1][0];
-                       prevVal= prev->vec[1][1];
+                       prevPosi = prev->vec[1][0];
+                       prevVal = prev->vec[1][1];
                        
                        /* keyframe to be added at point where there are already two similar points? */
                        if (IS_EQF(prevPosi, cFrame) && IS_EQF(beztPosi, cFrame) && IS_EQF(beztPosi, prevPosi)) {
@@ -422,7 +422,7 @@ static short new_key_needed (FCurve *fcu, float cFrame, float nValue)
                                        float realVal;
                                        
                                        /* get real value of curve at that point */
-                                       realVal= evaluate_fcurve(fcu, cFrame);
+                                       realVal = evaluate_fcurve(fcu, cFrame);
                                        
                                        /* compare whether it's the same as proposed */
                                        if (IS_EQF(realVal, nValue))
@@ -448,13 +448,13 @@ static short new_key_needed (FCurve *fcu, float cFrame, float nValue)
                        /* just add a keyframe if there's only one keyframe 
                         * and the new one occurs before the existing one does.
                         */
-                       if ((cFrame < beztPosi) && (totCount==1))
+                       if ((cFrame < beztPosi) && (totCount == 1))
                                return KEYNEEDED_JUSTADD;
                }
                
                /* continue. frame to do not yet passed (or other conditions not met) */
-               if (i < (totCount-1)) {
-                       prev= bezt;
+               if (i < (totCount - 1)) {
+                       prev = bezt;
                        bezt++;
                }
                else
@@ -468,13 +468,13 @@ static short new_key_needed (FCurve *fcu, float cFrame, float nValue)
         * -> Otherwise, a keyframe is just added. 1.0 is added so that fake-2nd-to-last
         *       keyframe is not equal to last keyframe.
         */
-       bezt= (fcu->bezt + (fcu->totvert - 1));
-       valA= bezt->vec[1][1];
+       bezt = (fcu->bezt + (fcu->totvert - 1));
+       valA = bezt->vec[1][1];
        
        if (prev)
-               valB= prev->vec[1][1];
+               valB = prev->vec[1][1];
        else 
-               valB= bezt->vec[1][1] + 1.0f; 
+               valB = bezt->vec[1][1] + 1.0f;
                
        if (IS_EQF(valA, nValue) && IS_EQF(valA, valB))
                return KEYNEEDED_DELPREV;
@@ -485,31 +485,31 @@ static short new_key_needed (FCurve *fcu, float cFrame, float nValue)
 /* ------------------ RNA Data-Access Functions ------------------ */
 
 /* Try to read value using RNA-properties obtained already */
-static float setting_get_rna_value (PointerRNA *ptr, PropertyRNA *prop, int index)
+static float setting_get_rna_value(PointerRNA *ptr, PropertyRNA *prop, int index)
 {
-       float value= 0.0f;
+       float value = 0.0f;
        
        switch (RNA_property_type(prop)) {
                case PROP_BOOLEAN:
                        if (RNA_property_array_length(ptr, prop))
-                               value= (float)RNA_property_boolean_get_index(ptr, prop, index);
+                               value = (float)RNA_property_boolean_get_index(ptr, prop, index);
                        else
-                               value= (float)RNA_property_boolean_get(ptr, prop);
+                               value = (float)RNA_property_boolean_get(ptr, prop);
                        break;
                case PROP_INT:
                        if (RNA_property_array_length(ptr, prop))
-                               value= (float)RNA_property_int_get_index(ptr, prop, index);
+                               value = (float)RNA_property_int_get_index(ptr, prop, index);
                        else
-                               value= (float)RNA_property_int_get(ptr, prop);
+                               value = (float)RNA_property_int_get(ptr, prop);
                        break;
                case PROP_FLOAT:
                        if (RNA_property_array_length(ptr, prop))
-                               value= RNA_property_float_get_index(ptr, prop, index);
+                               value = RNA_property_float_get_index(ptr, prop, index);
                        else
-                               value= RNA_property_float_get(ptr, prop);
+                               value = RNA_property_float_get(ptr, prop);
                        break;
                case PROP_ENUM:
-                       value= (float)RNA_property_enum_get(ptr, prop);
+                       value = (float)RNA_property_enum_get(ptr, prop);
                        break;
                default:
                        break;
@@ -534,12 +534,12 @@ enum {
  * blocktypes, when using "standard" keying but 'Visual Keying' option in Auto-Keying 
  * settings is on.
  */
-static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
+static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
 {
-       bConstraint *con= NULL;
-       short searchtype= VISUALKEY_NONE;
+       bConstraint *con = NULL;
+       short searchtype = VISUALKEY_NONE;
        short has_parent = FALSE;
-       const char *identifier= NULL;
+       const char *identifier = NULL;
        
        /* validate data */
        // TODO: this check is probably not needed, but it won't hurt
@@ -547,25 +547,25 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                return 0;
                
        /* get first constraint and determine type of keyframe constraints to check for 
-        *      - constraints can be on either Objects or PoseChannels, so we only check if the
+        *  - constraints can be on either Objects or PoseChannels, so we only check if the
         *    ptr->type is RNA_Object or RNA_PoseBone, which are the RNA wrapping-info for
         *    those structs, allowing us to identify the owner of the data
         */
        if (ptr->type == &RNA_Object) {
                /* Object */
-               Object *ob= (Object *)ptr->data;
+               Object *ob = (Object *)ptr->data;
                
-               con= ob->constraints.first;
-               identifier= RNA_property_identifier(prop);
-               has_parent= (ob->parent != NULL);
+               con = ob->constraints.first;
+               identifier = RNA_property_identifier(prop);
+               has_parent = (ob->parent != NULL);
        }
        else if (ptr->type == &RNA_PoseBone) {
                /* Pose Channel */
-               bPoseChannel *pchan= (bPoseChannel *)ptr->data;
+               bPoseChannel *pchan = (bPoseChannel *)ptr->data;
                
-               con= pchan->constraints.first;
-               identifier= RNA_property_identifier(prop);
-               has_parent= (pchan->parent != NULL);
+               con = pchan->constraints.first;
+               identifier = RNA_property_identifier(prop);
+               has_parent = (pchan->parent != NULL);
        }
        
        /* check if any data to search using */
@@ -578,10 +578,10 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                return 0;
        }
        else if (strstr(identifier, "location")) {
-               searchtype= VISUALKEY_LOC;
+               searchtype = VISUALKEY_LOC;
        }
        else if (strstr(identifier, "rotation")) {
-               searchtype= VISUALKEY_ROT;
+               searchtype = VISUALKEY_ROT;
        }
        else {
                printf("%s failed: identifier - '%s'\n", __func__, identifier);
@@ -596,7 +596,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                        return 1;
                
                /* constraints */
-               for (; con; con= con->next) {
+               for (; con; con = con->next) {
                        /* only consider constraint if it is not disabled, and has influence */
                        if (con->flag & CONSTRAINT_DISABLE) continue;
                        if (con->enforce == 0.0f) continue;
@@ -616,28 +616,28 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                                        
                                /* single-transform constraits  */
                                case CONSTRAINT_TYPE_TRACKTO:
-                                       if (searchtype==VISUALKEY_ROT) return 1;
+                                       if (searchtype == VISUALKEY_ROT) return 1;
                                        break;
                                case CONSTRAINT_TYPE_ROTLIMIT:
-                                       if (searchtype==VISUALKEY_ROT) return 1;
+                                       if (searchtype == VISUALKEY_ROT) return 1;
                                        break;
                                case CONSTRAINT_TYPE_LOCLIMIT:
-                                       if (searchtype==VISUALKEY_LOC) return 1;
+                                       if (searchtype == VISUALKEY_LOC) return 1;
                                        break;
                                case CONSTRAINT_TYPE_ROTLIKE:
-                                       if (searchtype==VISUALKEY_ROT) return 1;
+                                       if (searchtype == VISUALKEY_ROT) return 1;
                                        break;
                                case CONSTRAINT_TYPE_DISTLIMIT:
-                                       if (searchtype==VISUALKEY_LOC) return 1;
+                                       if (searchtype == VISUALKEY_LOC) return 1;
                                        break;
                                case CONSTRAINT_TYPE_LOCLIKE:
-                                       if (searchtype==VISUALKEY_LOC) return 1;
+                                       if (searchtype == VISUALKEY_LOC) return 1;
                                        break;
                                case CONSTRAINT_TYPE_LOCKTRACK:
-                                       if (searchtype==VISUALKEY_ROT) return 1;
+                                       if (searchtype == VISUALKEY_ROT) return 1;
                                        break;
                                case CONSTRAINT_TYPE_MINMAX:
-                                       if (searchtype==VISUALKEY_LOC) return 1;
+                                       if (searchtype == VISUALKEY_LOC) return 1;
                                        break;
                                
                                default:
@@ -654,18 +654,18 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
  * In the event that it is not possible to perform visual keying, try to fall-back
  * to using the default method. Assumes that all data it has been passed is valid.
  */
-static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_index)
+static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_index)
 {
-       const char *identifier= RNA_property_identifier(prop);
+       const char *identifier = RNA_property_identifier(prop);
        
        /* handle for Objects or PoseChannels only 
-        *      - constraints can be on either Objects or PoseChannels, so we only check if the
+        *  - constraints can be on either Objects or PoseChannels, so we only check if the
         *        ptr->type is RNA_Object or RNA_PoseBone, which are the RNA wrapping-info for
-        *        those structs, allowing us to identify the owner of the data 
+        *        those structs, allowing us to identify the owner of the data
         *      - assume that array_index will be sane
         */
        if (ptr->type == &RNA_Object) {
-               Object *ob= (Object *)ptr->data;
+               Object *ob = (Object *)ptr->data;
                
                /* only Location or Rotation keyframes are supported now */
                if (strstr(identifier, "location")) {
@@ -699,7 +699,7 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
        }
        else if (ptr->type == &RNA_PoseBone) {
                Object *ob = (Object *)ptr->id.data; /* we assume that this is always set, and is an object */
-               bPoseChannel *pchan= (bPoseChannel *)ptr->data;
+               bPoseChannel *pchan = (bPoseChannel *)ptr->data;
                float tmat[4][4];
                
                /* Although it is not strictly required for this particular space conversion, 
@@ -752,7 +752,7 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
 /* ------------------------- Insert Key API ------------------------- */
 
 /* Secondary Keyframing API call: 
- *     Use this when validation of necessary animation data is not necessary, since an RNA-pointer to the necessary
+ *  Use this when validation of necessary animation data is not necessary, since an RNA-pointer to the necessary
  *     data being keyframed, and a pointer to the F-Curve to use have both been provided.
  *
  *     The flag argument is used for special settings that alter the behavior of
@@ -761,7 +761,7 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_
  */
 short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu, float cfra, short flag)
 {
-       float curval= 0.0f;
+       float curval = 0.0f;
        
        /* no F-Curve to add keyframe to? */
        if (fcu == NULL) {
@@ -771,13 +771,13 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
        /* F-Curve not editable? */
        if (fcurve_is_keyframable(fcu) == 0) {
                BKE_reportf(reports, RPT_ERROR, 
-                       "F-Curve with path = '%s' [%d] cannot be keyframed. Ensure that it is not locked or sampled. Also, try removing F-Modifiers",
-                       fcu->rna_path, fcu->array_index);
+                           "F-Curve with path = '%s' [%d] cannot be keyframed. Ensure that it is not locked or sampled. Also, try removing F-Modifiers",
+                           fcu->rna_path, fcu->array_index);
                return 0;
        }
        
        /* if no property given yet, try to validate from F-Curve info */
-       if ((ptr.id.data == NULL) && (ptr.data==NULL)) {
+       if ((ptr.id.data == NULL) && (ptr.data == NULL)) {
                BKE_report(reports, RPT_ERROR, "No RNA-pointer available to retrieve values for keyframing from");
                return 0;
        }
@@ -787,21 +787,21 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
                /* try to get property we should be affecting */
                if ((RNA_path_resolve(&ptr, fcu->rna_path, &tmp_ptr, &prop) == 0) || (prop == NULL)) {
                        /* property not found... */
-                       const char *idname= (ptr.id.data) ? ((ID *)ptr.id.data)->name : "<No ID-Pointer>";
+                       const char *idname = (ptr.id.data) ? ((ID *)ptr.id.data)->name : "<No ID-Pointer>";
                        
                        BKE_reportf(reports, RPT_ERROR,
-                               "Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)", 
-                               idname, fcu->rna_path);
+                                   "Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
+                                   idname, fcu->rna_path);
                        return 0;
                }
                else {
                        /* property found, so overwrite 'ptr' to make later code easier */
-                       ptr= tmp_ptr;
+                       ptr = tmp_ptr;
                }
        }
        
        /* set additional flags for the F-Curve (i.e. only integer values) */
-       fcu->flag &= ~(FCURVE_INT_VALUES|FCURVE_DISCRETE_VALUES);
+       fcu->flag &= ~(FCURVE_INT_VALUES | FCURVE_DISCRETE_VALUES);
        switch (RNA_property_type(prop)) {
                case PROP_FLOAT:
                        /* do nothing */
@@ -815,23 +815,23 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
                         * values at all) interpolation between all points
                         *      - however, we must also ensure that evaluated values are only integers still
                         */
-                       fcu->flag |= (FCURVE_DISCRETE_VALUES|FCURVE_INT_VALUES);
+                       fcu->flag |= (FCURVE_DISCRETE_VALUES | FCURVE_INT_VALUES);
                        break;
        }
        
        /* obtain value to give keyframe */
        if ( (flag & INSERTKEY_MATRIX) && 
-                (visualkey_can_use(&ptr, prop)) ) 
+            (visualkey_can_use(&ptr, prop)) )
        {
                /* visual-keying is only available for object and pchan datablocks, as 
                 * it works by keyframing using a value extracted from the final matrix 
                 * instead of using the kt system to extract a value.
                 */
-               curval= visualkey_get_value(&ptr, prop, fcu->array_index);
+               curval = visualkey_get_value(&ptr, prop, fcu->array_index);
        }
        else {
                /* read value from system */
-               curval= setting_get_rna_value(&ptr, prop, fcu->array_index);
+               curval = setting_get_rna_value(&ptr, prop, fcu->array_index);
        }
        
        /* only insert keyframes where they are needed */
@@ -839,7 +839,7 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
                short insert_mode;
                
                /* check whether this curve really needs a new keyframe */
-               insert_mode= new_key_needed(fcu, cfra, curval);
+               insert_mode = new_key_needed(fcu, cfra, curval);
                
                /* insert new keyframe at current frame */
                if (insert_mode)
@@ -848,7 +848,7 @@ short insert_keyframe_direct(ReportList *reports, PointerRNA ptr, PropertyRNA *p
                /* delete keyframe immediately before/after newly added */
                switch (insert_mode) {
                        case KEYNEEDED_DELPREV:
-                               delete_fcurve_key(fcu, fcu->totvert-2, 1);
+                               delete_fcurve_key(fcu, fcu->totvert - 2, 1);
                                break;
                        case KEYNEEDED_DELNEXT:
                                delete_fcurve_key(fcu, 1, 1);
@@ -885,8 +885,8 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
        PointerRNA id_ptr, ptr;
        PropertyRNA *prop = NULL;
        FCurve *fcu;
-       int array_index_max= array_index+1;
-       int ret= 0;
+       int array_index_max = array_index + 1;
+       int ret = 0;
        
        /* validate pointer first - exit if failure */
        if (id == NULL) {
@@ -897,33 +897,33 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
        RNA_id_pointer_create(id, &id_ptr);
        if ((RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop) == 0) || (prop == NULL)) {
                BKE_reportf(reports, RPT_ERROR,
-                       "Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)", 
-                       (id)? id->name : "<Missing ID-Block>", rna_path);
+                           "Could not insert keyframe, as RNA Path is invalid for the given ID (ID = %s, Path = %s)",
+                           (id) ? id->name : "<Missing ID-Block>", rna_path);
                return 0;
        }
        
        /* if no action is provided, keyframe to the default one attached to this ID-block */
        if (act == NULL) {
-               AnimData *adt= BKE_animdata_from_id(id);
+               AnimData *adt = BKE_animdata_from_id(id);
                
                /* get action to add F-Curve+keyframe to */
-               act= verify_adt_action(id, 1);
+               act = verify_adt_action(id, 1);
                
                if (act == NULL) {
                        BKE_reportf(reports, RPT_ERROR, 
-                               "Could not insert keyframe, as this type does not support animation data (ID = %s, Path = %s)", 
-                               id->name, rna_path);
+                                   "Could not insert keyframe, as this type does not support animation data (ID = %s, Path = %s)",
+                                   id->name, rna_path);
                        return 0;
                }
                
                /* apply NLA-mapping to frame to use (if applicable) */
-               cfra= BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
+               cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
        }
        
        /* key entire array convenience method */
        if (array_index == -1) { 
-               array_index= 0;
-               array_index_max= RNA_property_array_length(&ptr, prop);
+               array_index = 0;
+               array_index_max = RNA_property_array_length(&ptr, prop);
                
                /* for single properties, increase max_index so that the property itself gets included,
                 * but don't do this for standard arrays since that can cause corruption issues 
@@ -939,7 +939,7 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
                 *      - if we're replacing keyframes only, DO NOT create new F-Curves if they do not exist yet
                 *        but still try to get the F-Curve if it exists...
                 */
-               fcu= verify_fcurve(act, group, rna_path, array_index, (flag & INSERTKEY_REPLACE)==0);
+               fcu = verify_fcurve(act, group, rna_path, array_index, (flag & INSERTKEY_REPLACE) == 0);
                
                /* we may not have a F-Curve when we're replacing only... */
                if (fcu) {
@@ -949,7 +949,7 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
                                 * is determined by the array index for the F-Curve
                                 */
                                if (ELEM5(RNA_property_subtype(prop), PROP_TRANSLATION, PROP_XYZ, PROP_EULER, PROP_COLOR, PROP_COORDS)) {
-                                       fcu->color_mode= FCURVE_COLOR_AUTO_RGB;
+                                       fcu->color_mode = FCURVE_COLOR_AUTO_RGB;
                                }
                        }
                        
@@ -973,11 +973,11 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
  */
 short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short UNUSED(flag))
 {
-       AnimData *adt= BKE_animdata_from_id(id);
+       AnimData *adt = BKE_animdata_from_id(id);
        PointerRNA id_ptr, ptr;
        PropertyRNA *prop;
-       int array_index_max= array_index+1;
-       int ret= 0;
+       int array_index_max = array_index + 1;
+       int ret = 0;
        
        /* sanity checks */
        if (ELEM(NULL, id, adt)) {
@@ -994,17 +994,17 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
        
        /* get F-Curve
         * Note: here is one of the places where we don't want new Action + F-Curve added!
-        *              so 'add' var must be 0
+        *      so 'add' var must be 0
         */
        if (act == NULL) {
                /* if no action is provided, use the default one attached to this ID-block 
-                *      - if it doesn't exist, then we're out of options...
+                *  - if it doesn't exist, then we're out of options...
                 */
                if (adt->action) {
-                       act= adt->action;
+                       act = adt->action;
                        
                        /* apply NLA-mapping to frame to use (if applicable) */
-                       cfra= BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP); 
+                       cfra = BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
                }
                else {
                        BKE_reportf(reports, RPT_ERROR, "No Action to delete keyframes from for ID = %s\n", id->name);
@@ -1014,8 +1014,8 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
        
        /* key entire array convenience method */
        if (array_index == -1) { 
-               array_index= 0;
-               array_index_max= RNA_property_array_length(&ptr, prop);
+               array_index = 0;
+               array_index_max = RNA_property_array_length(&ptr, prop);
                
                /* for single properties, increase max_index so that the property itself gets included,
                 * but don't do this for standard arrays since that can cause corruption issues 
@@ -1027,7 +1027,7 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
        
        /* will only loop once unless the array index was -1 */
        for (; array_index < array_index_max; array_index++) {
-               FCurve *fcu= verify_fcurve(act, group, rna_path, array_index, 0);
+               FCurve *fcu = verify_fcurve(act, group, rna_path, array_index, 0);
                short found = -1;
                int i;
                
@@ -1075,9 +1075,9 @@ enum {
  */
 static int modify_key_op_poll(bContext *C)
 {
-       ScrArea *sa= CTX_wm_area(C);
-       Scene *scene= CTX_data_scene(C);
-       SpaceOops *so= CTX_wm_space_outliner(C);
+       ScrArea *sa = CTX_wm_area(C);
+       Scene *scene = CTX_data_scene(C);
+       SpaceOops *so = CTX_wm_space_outliner(C);
        
        /* if no area or active scene */
        if (ELEM(NULL, sa, scene)) 
@@ -1099,13 +1099,13 @@ static int modify_key_op_poll(bContext *C)
 
 /* Insert Key Operator ------------------------ */
 
-static int insert_key_exec (bContext *C, wmOperator *op)
+static int insert_key_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain= CTX_data_main(C);
-       Scene *scene= CTX_data_scene(C);
-       KeyingSet *ks= NULL;
-       int type= RNA_enum_get(op->ptr, "type");
-       float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
+       Main *bmain = CTX_data_main(C);
+       Scene *scene = CTX_data_scene(C);
+       KeyingSet *ks = NULL;
+       int type = RNA_enum_get(op->ptr, "type");
+       float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
        short success;
        
        /* type is the Keying Set the user specified to use when calling the operator:
@@ -1114,11 +1114,11 @@ static int insert_key_exec (bContext *C, wmOperator *op)
         *      - type < 0: use a builtin Keying Set
         */
        if (type == 0) 
-               type= scene->active_keyingset;
+               type = scene->active_keyingset;
        if (type > 0)
-               ks= BLI_findlink(&scene->keyingsets, type-1);
+               ks = BLI_findlink(&scene->keyingsets, type - 1);
        else
-               ks= BLI_findlink(&builtin_keyingsets, -type-1);
+               ks = BLI_findlink(&builtin_keyingsets, -type - 1);
                
        /* report failures */
        if (ks == NULL) {
@@ -1127,7 +1127,7 @@ static int insert_key_exec (bContext *C, wmOperator *op)
        }
        
        /* try to insert keyframes for the channels specified by KeyingSet */
-       success= ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
+       success = ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
        if (G.debug & G_DEBUG)
                BKE_reportf(op->reports, RPT_INFO, "KeyingSet '%s' - Successfully added %d Keyframes\n", ks->name, success);
        
@@ -1142,7 +1142,7 @@ static int insert_key_exec (bContext *C, wmOperator *op)
                        BKE_reportf(op->reports, RPT_INFO, "Successfully added %d Keyframes for KeyingSet '%s'", success, ks->name);
                
                /* send notifiers that keyframes have been changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
        }
        else
                BKE_report(op->reports, RPT_WARNING, "Keying Set failed to insert any keyframes");
@@ -1167,10 +1167,10 @@ void ANIM_OT_keyframe_insert(wmOperatorType *ot)
        ot->poll = modify_key_op_poll;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
        
        /* keyingset to use (dynamic enum) */
-       prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
+       prop = RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
        RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf);
        RNA_def_property_flag(prop, PROP_HIDDEN);
        ot->prop = prop;
@@ -1178,8 +1178,8 @@ void ANIM_OT_keyframe_insert(wmOperatorType *ot)
        /* confirm whether a keyframe was added by showing a popup 
         *      - by default, this is enabled, since this operator is assumed to be called independently
         */
-       prop= RNA_def_boolean(ot->srna, "confirm_success", 1, "Confirm Successful Insert",
-                             "Show a popup when the keyframes get successfully added");
+       prop = RNA_def_boolean(ot->srna, "confirm_success", 1, "Confirm Successful Insert",
+                              "Show a popup when the keyframes get successfully added");
        RNA_def_property_flag(prop, PROP_HIDDEN);
 }
 
@@ -1188,9 +1188,9 @@ void ANIM_OT_keyframe_insert(wmOperatorType *ot)
  * then calls the menu if necessary before 
  */
 
-static int insert_key_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED(event))
+static int insert_key_menu_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {
-       Scene *scene= CTX_data_scene(C);
+       Scene *scene = CTX_data_scene(C);
        
        /* if prompting or no active Keying Set, show the menu */
        if ((scene->active_keyingset == 0) || RNA_boolean_get(op->ptr, "always_prompt")) {
@@ -1229,10 +1229,10 @@ void ANIM_OT_keyframe_insert_menu(wmOperatorType *ot)
        ot->poll = ED_operator_areaactive;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
        
        /* keyingset to use (dynamic enum) */
-       prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
+       prop = RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
        RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf);
        RNA_def_property_flag(prop, PROP_HIDDEN);
        ot->prop = prop;
@@ -1241,27 +1241,27 @@ void ANIM_OT_keyframe_insert_menu(wmOperatorType *ot)
         *      - by default, this is disabled so that if a menu is shown, this doesn't come up too
         */
        // XXX should this just be always on?
-       prop= RNA_def_boolean(ot->srna, "confirm_success", 0, "Confirm Successful Insert",
-                             "Show a popup when the keyframes get successfully added");
+       prop = RNA_def_boolean(ot->srna, "confirm_success", 0, "Confirm Successful Insert",
+                              "Show a popup when the keyframes get successfully added");
        RNA_def_property_flag(prop, PROP_HIDDEN);
        
        /* whether the menu should always be shown 
         *      - by default, the menu should only be shown when there is no active Keying Set (2.5 behavior),
         *        although in some cases it might be useful to always shown (pre 2.5 behavior)
         */
-       prop= RNA_def_boolean(ot->srna, "always_prompt", 0, "Always Show Menu", "");
+       prop = RNA_def_boolean(ot->srna, "always_prompt", 0, "Always Show Menu", "");
        RNA_def_property_flag(prop, PROP_HIDDEN);
 }
 
 /* Delete Key Operator ------------------------ */
 
-static int delete_key_exec (bContext *C, wmOperator *op)
+static int delete_key_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain= CTX_data_main(C);
-       Scene *scene= CTX_data_scene(C);
-       KeyingSet *ks= NULL;    
-       int type= RNA_enum_get(op->ptr, "type");
-       float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
+       Main *bmain = CTX_data_main(C);
+       Scene *scene = CTX_data_scene(C);
+       KeyingSet *ks = NULL;
+       int type = RNA_enum_get(op->ptr, "type");
+       float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
        short success;
        
        /* type is the Keying Set the user specified to use when calling the operator:
@@ -1270,11 +1270,11 @@ static int delete_key_exec (bContext *C, wmOperator *op)
         *      - type < 0: use a builtin Keying Set
         */
        if (type == 0) 
-               type= scene->active_keyingset;
+               type = scene->active_keyingset;
        if (type > 0)
-               ks= BLI_findlink(&scene->keyingsets, type-1);
+               ks = BLI_findlink(&scene->keyingsets, type - 1);
        else
-               ks= BLI_findlink(&builtin_keyingsets, -type-1);
+               ks = BLI_findlink(&builtin_keyingsets, -type - 1);
        
        /* report failure */
        if (ks == NULL) {
@@ -1283,7 +1283,7 @@ static int delete_key_exec (bContext *C, wmOperator *op)
        }
        
        /* try to delete keyframes for the channels specified by KeyingSet */
-       success= ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_DELETE, cfra);
+       success = ANIM_apply_keyingset(C, NULL, NULL, ks, MODIFYKEY_MODE_DELETE, cfra);
        if (G.debug & G_DEBUG)
                printf("KeyingSet '%s' - Successfully removed %d Keyframes\n", ks->name, success);
        
@@ -1298,7 +1298,7 @@ static int delete_key_exec (bContext *C, wmOperator *op)
                        BKE_reportf(op->reports, RPT_INFO, "Successfully removed %d Keyframes for KeyingSet '%s'", success, ks->name);
                
                /* send notifiers that keyframes have been changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
        }
        else
                BKE_report(op->reports, RPT_WARNING, "Keying Set failed to remove any keyframes");
@@ -1323,10 +1323,10 @@ void ANIM_OT_keyframe_delete(wmOperatorType *ot)
        ot->poll = modify_key_op_poll;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
        
        /* keyingset to use (dynamic enum) */
-       prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
+       prop = RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
        RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf);
        RNA_def_property_flag(prop, PROP_HIDDEN);
        ot->prop = prop;
@@ -1346,31 +1346,31 @@ void ANIM_OT_keyframe_delete(wmOperatorType *ot)
  * -- Joshua Leung, Jan 2009
  */
  
-static int delete_key_v3d_exec (bContext *C, wmOperator *op)
+static int delete_key_v3d_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain= CTX_data_main(C);
-       Scene *scene= CTX_data_scene(C);
-       float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
+       Main *bmain = CTX_data_main(C);
+       Scene *scene = CTX_data_scene(C);
+       float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
        
        // XXX more comprehensive tests will be needed
-       CTX_DATA_BEGIN (C, Object*, ob, selected_objects)
+       CTX_DATA_BEGIN(C, Object *, ob, selected_objects)
        {
-               ID *id= (ID *)ob;
+               ID *id = (ID *)ob;
                FCurve *fcu, *fcn;
-               short success= 0;
+               short success = 0;
                
                /* loop through all curves in animdata and delete keys on this frame */
                if ((ob->adt) && (ob->adt->action)) {
-                       AnimData *adt= ob->adt;
-                       bAction *act= adt->action;
+                       AnimData *adt = ob->adt;
+                       bAction *act = adt->action;
                        
-                       for (fcu= act->curves.first; fcu; fcu= fcn) {
-                               fcn= fcu->next;
-                               success+= delete_keyframe(op->reports, id, NULL, NULL, fcu->rna_path, fcu->array_index, cfra, 0);
+                       for (fcu = act->curves.first; fcu; fcu = fcn) {
+                               fcn = fcu->next;
+                               success += delete_keyframe(op->reports, id, NULL, NULL, fcu->rna_path, fcu->array_index, cfra, 0);
                        }
                }
                
-               BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully had %d keyframes removed", id->name+2, success);
+               BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully had %d keyframes removed", id->name + 2, success);
                
                ob->recalc |= OB_RECALC_OB;
        }
@@ -1379,7 +1379,7 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op)
        /* send updates */
        DAG_ids_flush_update(bmain, 0);
        
-       WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, NULL);
+       WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, NULL);
        
        return OPERATOR_FINISHED;
 }
@@ -1398,22 +1398,22 @@ void ANIM_OT_keyframe_delete_v3d(wmOperatorType *ot)
        ot->poll = ED_operator_areaactive;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 
 /* Insert Key Button Operator ------------------------ */
 
-static int insert_key_button_exec (bContext *C, wmOperator *op)
+static int insert_key_button_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain= CTX_data_main(C);
-       Scene *scene= CTX_data_scene(C);
-       PointerRNA ptr= {{NULL}};
-       PropertyRNA *prop= NULL;
+       Main *bmain = CTX_data_main(C);
+       Scene *scene = CTX_data_scene(C);
+       PointerRNA ptr = {{NULL}};
+       PropertyRNA *prop = NULL;
        char *path;
-       float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
-       short success= 0;
-       int a, index, length, all= RNA_boolean_get(op->ptr, "all");
+       float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
+       short success = 0;
+       int a, index, length, all = RNA_boolean_get(op->ptr, "all");
        short flag = 0;
        
        /* flags for inserting keyframes */
@@ -1423,29 +1423,29 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
        uiContextActiveProperty(C, &ptr, &prop, &index);
        
        if ((ptr.id.data && ptr.data && prop) && RNA_property_animateable(&ptr, prop)) {
-               path= RNA_path_from_ID_to_property(&ptr, prop);
+               path = RNA_path_from_ID_to_property(&ptr, prop);
                
                if (path) {
                        if (all) {
-                               length= RNA_property_array_length(&ptr, prop);
+                               length = RNA_property_array_length(&ptr, prop);
                                
-                               if (length) index= 0;
-                               else length= 1;
+                               if (length) index = 0;
+                               else length = 1;
                        }
                        else
-                               length= 1;
+                               length = 1;
                        
-                       for (a=0; a<length; a++)
-                               success+= insert_keyframe(op->reports, ptr.id.data, NULL, NULL, path, index+a, cfra, flag);
+                       for (a = 0; a < length; a++)
+                               success += insert_keyframe(op->reports, ptr.id.data, NULL, NULL, path, index + a, cfra, flag);
                        
                        MEM_freeN(path);
                }
                else if (ptr.type == &RNA_NlaStrip) {
                        /* handle special vars for NLA-strips */
-                       NlaStrip *strip= (NlaStrip *)ptr.data;
-                       FCurve *fcu= list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), flag);
+                       NlaStrip *strip = (NlaStrip *)ptr.data;
+                       FCurve *fcu = list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), flag);
                        
-                       success+= insert_keyframe_direct(op->reports, ptr, prop, fcu, cfra, 0);
+                       success += insert_keyframe_direct(op->reports, ptr, prop, fcu, cfra, 0);
                }
                else {
                        if (G.debug & G_DEBUG)
@@ -1468,10 +1468,10 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
                DAG_ids_flush_update(bmain, 0);
                
                /* send notifiers that keyframes have been changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
        }
        
-       return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
+       return (success) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void ANIM_OT_keyframe_insert_button(wmOperatorType *ot)
@@ -1494,35 +1494,35 @@ void ANIM_OT_keyframe_insert_button(wmOperatorType *ot)
 
 /* Delete Key Button Operator ------------------------ */
 
-static int delete_key_button_exec (bContext *C, wmOperator *op)
+static int delete_key_button_exec(bContext *C, wmOperator *op)
 {
-       Main *bmain= CTX_data_main(C);
-       Scene *scene= CTX_data_scene(C);
-       PointerRNA ptr= {{NULL}};
-       PropertyRNA *prop= NULL;
+       Main *bmain = CTX_data_main(C);
+       Scene *scene = CTX_data_scene(C);
+       PointerRNA ptr = {{NULL}};
+       PropertyRNA *prop = NULL;
        char *path;
-       float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
-       short success= 0;
-       int a, index, length, all= RNA_boolean_get(op->ptr, "all");
+       float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
+       short success = 0;
+       int a, index, length, all = RNA_boolean_get(op->ptr, "all");
        
        /* try to insert keyframe using property retrieved from UI */
        uiContextActiveProperty(C, &ptr, &prop, &index);
 
        if (ptr.id.data && ptr.data && prop) {
-               path= RNA_path_from_ID_to_property(&ptr, prop);
+               path = RNA_path_from_ID_to_property(&ptr, prop);
                
                if (path) {
                        if (all) {
-                               length= RNA_property_array_length(&ptr, prop);
+                               length = RNA_property_array_length(&ptr, prop);
                                
-                               if (length) index= 0;
-                               else length= 1;
+                               if (length) index = 0;
+                               else length = 1;
                        }
                        else
-                               length= 1;
+                               length = 1;
                        
-                       for (a=0; a<length; a++)
-                               success+= delete_keyframe(op->reports, ptr.id.data, NULL, NULL, path, index+a, cfra, 0);
+                       for (a = 0; a < length; a++)
+                               success += delete_keyframe(op->reports, ptr.id.data, NULL, NULL, path, index + a, cfra, 0);
                        
                        MEM_freeN(path);
                }
@@ -1541,10 +1541,10 @@ static int delete_key_button_exec (bContext *C, wmOperator *op)
                DAG_ids_flush_update(bmain, 0);
                
                /* send notifiers that keyframes have been changed */
-               WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+               WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
        }
        
-       return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
+       return (success) ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
 }
 
 void ANIM_OT_keyframe_delete_button(wmOperatorType *ot)
@@ -1570,7 +1570,7 @@ void ANIM_OT_keyframe_delete_button(wmOperatorType *ot)
 
 int autokeyframe_cfra_can_key(Scene *scene, ID *id)
 {
-       float cfra= (float)CFRA; // XXX for now, this will do
+       float cfra = (float)CFRA; // XXX for now, this will do
        
        /* only filter if auto-key mode requires this */
        if (IS_AUTOKEY_ON(scene) == 0)
@@ -1580,7 +1580,7 @@ int autokeyframe_cfra_can_key(Scene *scene, ID *id)
                /* can insert anytime we like... */
                return 1;
        }
-       else /* REPLACE */ {
+       else { /* REPLACE */
                /* for whole block - only key if there's a keyframe on that frame already
                 *      this is a valid assumption when we're blocking + tweaking
                 */
@@ -1601,12 +1601,12 @@ short fcurve_frame_has_keyframe(FCurve *fcu, float frame, short filter)
                return 0;
        
        /* we either include all regardless of muting, or only non-muted  */
-       if ((filter & ANIMFILTER_KEYS_MUTED) || (fcu->flag & FCURVE_MUTED)==0) {
+       if ((filter & ANIMFILTER_KEYS_MUTED) || (fcu->flag & FCURVE_MUTED) == 0) {
                short replace = -1;
                int i = binarysearch_bezt_index(fcu->bezt, frame, fcu->totvert, &replace);
                
                /* binarysearch_bezt_index will set replace to be 0 or 1
-                *      - obviously, 1 represents a match
+                * - obviously, 1 represents a match
                 */
                if (replace) {                  
                        /* sanity check: 'i' may in rare cases exceed arraylen */
@@ -1621,7 +1621,7 @@ short fcurve_frame_has_keyframe(FCurve *fcu, float frame, short filter)
 /* Checks whether an Action has a keyframe for a given frame 
  * Since we're only concerned whether a keyframe exists, we can simply loop until a match is found...
  */
-static short action_frame_has_keyframe (bAction *act, float frame, short filter)
+static short action_frame_has_keyframe(bAction *act, float frame, short filter)
 {
        FCurve *fcu;
        
@@ -1636,7 +1636,7 @@ static short action_frame_has_keyframe (bAction *act, float frame, short filter)
        /* loop over F-Curves, using binary-search to try to find matches 
         *      - this assumes that keyframes are only beztriples
         */
-       for (fcu= act->curves.first; fcu; fcu= fcu->next) {
+       for (fcu = act->curves.first; fcu; fcu = fcu->next) {
                /* only check if there are keyframes (currently only of type BezTriple) */
                if (fcu->bezt && fcu->totvert) {
                        if (fcurve_frame_has_keyframe(fcu, frame, filter))
@@ -1649,7 +1649,7 @@ static short action_frame_has_keyframe (bAction *act, float frame, short filter)
 }
 
 /* Checks whether an Object has a keyframe for a given frame */
-static short object_frame_has_keyframe (Object *ob, float frame, short filter)
+static short object_frame_has_keyframe(Object *ob, float frame, short filter)
 {
        /* error checking */
        if (ob == NULL)
@@ -1662,26 +1662,26 @@ static short object_frame_has_keyframe (Object *ob, float frame, short filter)
        }
        
        /* try shapekey keyframes (if available, and allowed by filter) */
-       if ( !(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY) ) {
-               Key *key= ob_get_key(ob);
+       if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY) ) {
+               Key *key = ob_get_key(ob);
                
                /* shapekeys can have keyframes ('Relative Shape Keys') 
                 * or depend on time (old 'Absolute Shape Keys') 
                 */
                 
-                       /* 1. test for relative (with keyframes) */
+               /* 1. test for relative (with keyframes) */
                if (id_frame_has_keyframe((ID *)key, frame, filter))
                        return 1;
                        
-                       /* 2. test for time */
+               /* 2. test for time */
                // TODO... yet to be implemented (this feature may evolve before then anyway)
        }
        
        /* try materials */
-       if ( !(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOMAT) ) {
+       if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOMAT) ) {
                /* if only active, then we can skip a lot of looping */
                if (filter & ANIMFILTER_KEYS_ACTIVE) {
-                       Material *ma= give_current_material(ob, (ob->actcol + 1));
+                       Material *ma = give_current_material(ob, (ob->actcol + 1));
                        
                        /* we only retrieve the active material... */
                        if (id_frame_has_keyframe((ID *)ma, frame, filter))
@@ -1691,8 +1691,8 @@ static short object_frame_has_keyframe (Object *ob, float frame, short filter)
                        int a;
                        
                        /* loop over materials */
-                       for (a=0; a<ob->totcol; a++) {
-                               Material *ma= give_current_material(ob, a+1);
+                       for (a = 0; a < ob->totcol; a++) {
+                               Material *ma = give_current_material(ob, a + 1);
                                
                                if (id_frame_has_keyframe((ID *)ma, frame, filter))
                                        return 1;
@@ -1723,15 +1723,15 @@ short id_frame_has_keyframe(ID *id, float frame, short filter)
                // XXX TODO... for now, just use 'normal' behavior
                //      break;
                
-               default:        /* 'normal type' */
+               default:  /* 'normal type' */
                {
-                       AnimData *adt= BKE_animdata_from_id(id);
+                       AnimData *adt = BKE_animdata_from_id(id);
                        
                        /* only check keyframes in active action */
                        if (adt)
                                return action_frame_has_keyframe(adt->action, frame, filter);
                }
-                       break;
+               break;
        }
        
        
index 05dc2d1c04e65545f3b3626510311b3920ee7060..83f6b1d1824eec00526bb5a9f479242208a0a926 100644 (file)
 
 #include "curve_intern.h"
 
-#define MAXTEXT        32766
+#define MAXTEXT 32766
 
 /************************* utilities ******************************/
 
 static char findaccent(char char1, unsigned int code)
 {
-       char new= 0;
-       
-       if (char1=='a') {
-               if (code=='`') new= 224;
-               else if (code==39) new= 225;
-               else if (code=='^') new= 226;
-               else if (code=='~') new= 227;
-               else if (code=='"') new= 228;
-               else if (code=='o') new= 229;
-               else if (code=='e') new= 230;
-               else if (code=='-') new= 170;
+       char new = 0;
+       
+       if (char1 == 'a') {
+               if (code == '`') new = 224;
+               else if (code == 39) new = 225;
+               else if (code == '^') new = 226;
+               else if (code == '~') new = 227;
+               else if (code == '"') new = 228;
+               else if (code == 'o') new = 229;
+               else if (code == 'e') new = 230;
+               else if (code == '-') new = 170;
        }
-       else if (char1=='c') {
-               if (code==',') new= 231;
-               if (code=='|') new= 162;
+       else if (char1 == 'c') {
+               if (code == ',') new = 231;
+               if (code == '|') new = 162;
        }
-       else if (char1=='e') {
-               if (code=='`') new= 232;
-               else if (code==39) new= 233;
-               else if (code=='^') new= 234;
-               else if (code=='"') new= 235;
+       else if (char1 == 'e') {
+               if (code == '`') new = 232;
+               else if (code == 39) new = 233;
+               else if (code == '^') new = 234;
+               else if (code == '"') new = 235;
        }
-       else if (char1=='i') {
-               if (code=='`') new= 236;
-               else if (code==39) new= 237;
-               else if (code=='^') new= 238;
-               else if (code=='"') new= 239;
+       else if (char1 == 'i') {
+               if (code == '`') new = 236;
+               else if (code == 39) new = 237;
+               else if (code == '^') new = 238;
+               else if (code == '"') new = 239;
        }
-       else if (char1=='n') {
-               if (code=='~') new= 241;
+       else if (char1 == 'n') {
+               if (code == '~') new = 241;
        }
-       else if (char1=='o') {
-               if (code=='`') new= 242;
-               else if (code==39) new= 243;
-               else if (code=='^') new= 244;
-               else if (code=='~') new= 245;
-               else if (code=='"') new= 246;
-               else if (code=='/') new= 248;
-               else if (code=='-') new= 186;
-               else if (code=='e') new= 143;
+       else if (char1 == 'o') {
+               if (code == '`') new = 242;
+               else if (code == 39) new = 243;
+               else if (code == '^') new = 244;
+               else if (code == '~') new = 245;
+               else if (code == '"') new = 246;
+               else if (code == '/') new = 248;
+               else if (code == '-') new = 186;
+               else if (code == 'e') new = 143;
        }
-       else if (char1=='s') {
-               if (code=='s') new= 167;
+       else if (char1 == 's') {
+               if (code == 's') new = 167;
        }
-       else if (char1=='u') {
-               if (code=='`') new= 249;
-               else if (code==39) new= 250;
-               else if (code=='^') new= 251;
-               else if (code=='"') new= 252;
+       else if (char1 == 'u') {
+               if (code == '`') new = 249;
+               else if (code == 39) new = 250;
+               else if (code == '^') new = 251;
+               else if (code == '"') new = 252;
        }
-       else if (char1=='y') {
-               if (code==39) new= 253;
-               else if (code=='"') new= 255;
+       else if (char1 == 'y') {
+               if (code == 39) new = 253;
+               else if (code == '"') new = 255;
        }
-       else if (char1=='A') {
-               if (code=='`') new= 192;
-               else if (code==39) new= 193;
-               else if (code=='^') new= 194;
-               else if (code=='~') new= 195;
-               else if (code=='"') new= 196;
-               else if (code=='o') new= 197;
-               else if (code=='e') new= 198;
+       else if (char1 == 'A') {
+               if (code == '`') new = 192;
+               else if (code == 39) new = 193;
+               else if (code == '^') new = 194;
+               else if (code == '~') new = 195;
+               else if (code == '"') new = 196;
+               else if (code == 'o') new = 197;
+               else if (code == 'e') new = 198;
        }
-       else if (char1=='C') {
-               if (code==',') new= 199;
+       else if (char1 == 'C') {
+               if (code == ',') new = 199;
        }
-       else if (char1=='E') {
-               if (code=='`') new= 200;
-               else if (code==39) new= 201;
-               else if (code=='^') new= 202;
-               else if (code=='"') new= 203;
+       else if (char1 == 'E') {
+               if (code == '`') new = 200;
+               else if (code == 39) new = 201;
+               else if (code == '^') new = 202;
+               else if (code == '"') new = 203;
        }
-       else if (char1=='I') {
-               if (code=='`') new= 204;
-               else if (code==39) new= 205;
-               else if (code=='^') new= 206;
-               else if (code=='"') new= 207;
+       else if (char1 == 'I') {
+               if (code == '`') new = 204;
+               else if (code == 39) new = 205;
+               else if (code == '^') new = 206;
+               else if (code == '"') new = 207;
        }
-       else if (char1=='N') {
-               if (code=='~') new= 209;
+       else if (char1 == 'N') {
+               if (code == '~') new = 209;
        }
-       else if (char1=='O') {
-               if (code=='`') new= 210;
-               else if (code==39) new= 211;
-               else if (code=='^') new= 212;
-               else if (code=='~') new= 213;
-               else if (code=='"') new= 214;
-               else if (code=='/') new= 216;
-               else if (code=='e') new= 141;
+       else if (char1 == 'O') {
+               if (code == '`') new = 210;
+               else if (code == 39) new = 211;
+               else if (code == '^') new = 212;
+               else if (code == '~') new = 213;
+               else if (code == '"') new = 214;
+               else if (code == '/') new = 216;
+               else if (code == 'e') new = 141;
        }
-       else if (char1=='U') {
-               if (code=='`') new= 217;
-               else if (code==39) new= 218;
-               else if (code=='^') new= 219;
-               else if (code=='"') new= 220;
+       else if (char1 == 'U') {
+               if (code == '`') new = 217;
+               else if (code == 39) new = 218;
+               else if (code == '^') new = 219;
+               else if (code == '"') new = 220;
        }
-       else if (char1=='Y') {
-               if (code==39) new= 221;
+       else if (char1 == 'Y') {
+               if (code == 39) new = 221;
        }
-       else if (char1=='1') {
-               if (code=='4') new= 188;
-               if (code=='2') new= 189;
+       else if (char1 == '1') {
+               if (code == '4') new = 188;
+               if (code == '2') new = 189;
        }
-       else if (char1=='3') {
-               if (code=='4') new= 190;
+       else if (char1 == '3') {
+               if (code == '4') new = 190;
        }
-       else if (char1==':') {
-               if (code=='-') new= 247;
+       else if (char1 == ':') {
+               if (code == '-') new = 247;
        }
-       else if (char1=='-') {
-               if (code==':') new= 247;
-               if (code=='|') new= 135;
-               if (code=='+') new= 177;
+       else if (char1 == '-') {
+               if (code == ':') new = 247;
+               if (code == '|') new = 135;
+               if (code == '+') new = 177;
        }
-       else if (char1=='|') {
-               if (code=='-') new= 135;
-               if (code=='=') new= 136;
+       else if (char1 == '|') {
+               if (code == '-') new = 135;
+               if (code == '=') new = 136;
        }
-       else if (char1=='=') {
-               if (code=='|') new= 136;
+       else if (char1 == '=') {
+               if (code == '|') new = 136;
        }
-       else if (char1=='+') {
-               if (code=='-') new= 177;
+       else if (char1 == '+') {
+               if (code == '-') new = 177;
        }
        
        if (new) return new;
@@ -212,7 +212,7 @@ static char findaccent(char char1, unsigned int code)
 
 static void update_string(Curve *cu)
 {
-       EditFont *ef= cu->editfont;
+       EditFont *ef = cu->editfont;
        int len;
 
        // Free the old curve string    
@@ -230,22 +230,22 @@ static void update_string(Curve *cu)
 
 static int insert_into_textbuf(Object *obedit, uintptr_t c)
 {
-       Curve *cu= obedit->data;
+       Curve *cu = obedit->data;
        
-       if (cu->len<MAXTEXT-1) {
-               EditFont *ef= cu->editfont;
+       if (cu->len < MAXTEXT - 1) {
+               EditFont *ef = cu->editfont;
                int x;
 
-               for (x= cu->len; x>cu->pos; x--) ef->textbuf[x]= ef->textbuf[x-1];
-               for (x= cu->len; x>cu->pos; x--) ef->textbufinfo[x]= ef->textbufinfo[x-1];              
-               ef->textbuf[cu->pos]= c;
+               for (x = cu->len; x > cu->pos; x--) ef->textbuf[x] = ef->textbuf[x - 1];
+               for (x = cu->len; x > cu->pos; x--) ef->textbufinfo[x] = ef->textbufinfo[x - 1];
+               ef->textbuf[cu->pos] = c;
                ef->textbufinfo[cu->pos] = cu->curinfo;
                ef->textbufinfo[cu->pos].kern = 0;
                ef->textbufinfo[cu->pos].mat_nr = obedit->actcol;
                                        
                cu->pos++;
                cu->len++;
-               ef->textbuf[cu->len]='\0';
+               ef->textbuf[cu->len] = '\0';
 
                update_string(cu);
 
@@ -257,18 +257,18 @@ static int insert_into_textbuf(Object *obedit, uintptr_t c)
 
 static void text_update_edited(bContext *C, Scene *scene, Object *obedit, int recalc, int mode)
 {
-       struct Main *bmain= CTX_data_main(C);
-       Curve *cu= obedit->data;
-       EditFont *ef= cu->editfont;
-       cu->curinfo = ef->textbufinfo[cu->pos?cu->pos-1:0];
+       struct Main *bmain = CTX_data_main(C);
+       Curve *cu = obedit->data;
+       EditFont *ef = cu->editfont;
+       cu->curinfo = ef->textbufinfo[cu->pos ? cu->pos - 1 : 0];
        
        if (obedit->totcol > 0) {
-               obedit->actcol= ef->textbufinfo[cu->pos?cu->pos-1:0].mat_nr;
+               obedit->actcol = ef->textbufinfo[cu->pos ? cu->pos - 1 : 0].mat_nr;
 
                /* since this array is calloc'd, it can be 0 even though we try ensure
                 * (mat_nr > 0) almost everywhere */
                if (obedit->actcol < 1) {
-                       obedit->actcol= 1;
+                       obedit->actcol = 1;
                }
        }
 
@@ -279,41 +279,41 @@ static void text_update_edited(bContext *C, Scene *scene, Object *obedit, int re
 
        if (recalc)
                DAG_id_tag_update(obedit->data, 0);
-       WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+       WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 }
 
 /********************** insert lorem operator *********************/
 
 static int insert_lorem_exec(bContext *C, wmOperator *UNUSED(op))
 {
-       Object *obedit= CTX_data_edit_object(C);
+       Object *obedit = CTX_data_edit_object(C);
        const char *p, *p2;
        int i;
        static const char *lastlorem;
        
        if (lastlorem)
-               p= lastlorem;
+               p = lastlorem;
        else
-               p= ED_lorem;
+               p = ED_lorem;
        
-       i= rand()/(RAND_MAX/6)+4;       
+       i = rand() / (RAND_MAX / 6) + 4;
                
-       for (p2=p; *p2 && i; p2++) {
+       for (p2 = p; *p2 && i; p2++) {
                insert_into_textbuf(obedit, *p2);
 
-               if (*p2=='.')
+               if (*p2 == '.')
                        i--;
        }
 
-       lastlorem = p2+1;
-       if (strlen(lastlorem)<5)
+       lastlorem = p2 + 1;
+       if (strlen(lastlorem) < 5)
                lastlorem = ED_lorem;
        
        insert_into_textbuf(obedit, '\n');
        insert_into_textbuf(obedit, '\n');      
 
        DAG_id_tag_update(obedit->data, 0);
-       WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+       WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
 }
@@ -330,7 +330,7 @@ void FONT_OT_insert_lorem(wmOperatorType *ot)
        ot->poll = ED_operator_editfont;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /******************* paste file operator ********************/
@@ -340,15 +340,15 @@ void FONT_OT_insert_lorem(wmOperatorType *ot)
 
 static int paste_file(bContext *C, ReportList *reports, const char *filename)
 {
-       Scene *scene= CTX_data_scene(C);
-       Object *obedit= CTX_data_edit_object(C);
-       Curve *cu= obedit->data;
-       EditFont *ef= cu->editfont;
+       Scene *scene = CTX_data_scene(C);
+       Object *obedit = CTX_data_edit_object(C);
+       Curve *cu = obedit->data;
+       EditFont *ef = cu->editfont;
        FILE *fp;
        int filelen;
        char *strp;
 
-       fp= BLI_fopen(filename, "r");
+       fp = BLI_fopen(filename, "r");
 
        if (!fp) {
                if (reports)
@@ -360,22 +360,22 @@ static int paste_file(bContext *C, ReportList *reports, const char *filename)
        filelen = ftell(fp);
        fseek(fp, 0L, SEEK_SET);
 
-       strp= MEM_callocN(filelen+4, "tempstr");
+       strp = MEM_callocN(filelen + 4, "tempstr");
 
        // fread() instead of read(), because windows read() converts text
        // to DOS \r\n linebreaks, causing double linebreaks in the 3d text
        filelen = fread(strp, 1, filelen, fp);
        fclose(fp);
-       strp[filelen]= 0;
+       strp[filelen] = 0;
 
-       if (cu->len+filelen<MAXTEXT) {
+       if (cu->len + filelen < MAXTEXT) {
                int tmplen;
-               wchar_t *mem = MEM_callocN((sizeof(wchar_t)*filelen)+(4*sizeof(wchar_t)), "temporary");
+               wchar_t *mem = MEM_callocN((sizeof(wchar_t) * filelen) + (4 * sizeof(wchar_t)), "temporary");
                tmplen = BLI_strncpy_wchar_from_utf8(mem, strp, filelen + 1);
                wcscat(ef->textbuf, mem);
                MEM_freeN(mem);
                cu->len += tmplen;
-               cu->pos= cu->len;
+               cu->pos = cu->len;
        }
        MEM_freeN(strp);
 
@@ -389,8 +389,8 @@ static int paste_file_exec(bContext *C, wmOperator *op)
        char *path;
        int retval;
        
-       path= RNA_string_get_alloc(op->ptr, "filepath", NULL, 0);
-       retval= paste_file(C, op->reports, path);
+       path = RNA_string_get_alloc(op->ptr, "filepath", NULL, 0);
+       retval = paste_file(C, op->reports, path);
        MEM_freeN(path);
 
        return retval;
@@ -419,17 +419,17 @@ void FONT_OT_file_paste(wmOperatorType *ot)
        ot->poll = ED_operator_editfont;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        /* properties */
-       WM_operator_properties_filesel(ot, FOLDERFILE|TEXTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+       WM_operator_properties_filesel(ot, FOLDERFILE | TEXTFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 }
 
 /******************* text to object operator ********************/
 
 static void txt_add_object(bContext *C, TextLine *firstline, int totline, float offset[3])
 {
-       Scene *scene= CTX_data_scene(C);
+       Scene *scene = CTX_data_scene(C);
        Curve *cu;
        Object *obedit;
        Base *base;
@@ -437,8 +437,8 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, float
        int nchars = 0, a;
        float rot[3] = {0.f, 0.f, 0.f};
        
-       obedit= BKE_object_add(scene, OB_FONT);
-       base= scene->basact;
+       obedit = BKE_object_add(scene, OB_FONT);
+       base = scene->basact;
 
        
        ED_object_base_init_transform(C, base, NULL, rot); /* seems to assume view align ? TODO - look into this, could be an operator option */
@@ -448,49 +448,49 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, float
        obedit->loc[1] += offset[1];
        obedit->loc[2] += offset[2];
 
-       cu= obedit->data;
-       cu->vfont= BKE_vfont_builtin_get();
+       cu = obedit->data;
+       cu->vfont = BKE_vfont_builtin_get();
        cu->vfont->id.us++;
 
-       for (tmp=firstline, a=0; cu->len<MAXTEXT && a<totline; tmp=tmp->next, a++)
+       for (tmp = firstline, a = 0; cu->len < MAXTEXT && a < totline; tmp = tmp->next, a++)
                nchars += strlen(tmp->line) + 1;
 
        if (cu->str) MEM_freeN(cu->str);
        if (cu->strinfo) MEM_freeN(cu->strinfo);        
 
-       cu->str= MEM_callocN(nchars+4, "str");
-       cu->strinfo= MEM_callocN((nchars+4)*sizeof(CharInfo), "strinfo");
+       cu->str = MEM_callocN(nchars + 4, "str");
+       cu->strinfo = MEM_callocN((nchars + 4) * sizeof(CharInfo), "strinfo");
 
-       cu->str[0]= '\0';
-       cu->len= 0;
-       cu->pos= 0;
+       cu->str[0] = '\0';
+       cu->len = 0;
+       cu->pos = 0;
        
-       for (tmp=firstline, a=0; cu->len<MAXTEXT && a<totline; tmp=tmp->next, a++) {
+       for (tmp = firstline, a = 0; cu->len < MAXTEXT && a < totline; tmp = tmp->next, a++) {
                strcat(cu->str, tmp->line);
-               cu->len+= strlen(tmp->line);
+               cu->len += strlen(tmp->line);
 
                if (tmp->next) {
                        strcat(cu->str, "\n");
                        cu->len++;
                }
 
-               cu->pos= cu->len;
+               cu->pos = cu->len;
        }
 
-       WM_event_add_notifier(C, NC_OBJECT|NA_ADDED, obedit);
+       WM_event_add_notifier(C, NC_OBJECT | NA_ADDED, obedit);
 }
 
 void ED_text_to_object(bContext *C, Text *text, int split_lines)
 {
-       RegionView3D *rv3d= CTX_wm_region_view3d(C);
+       RegionView3D *rv3d = CTX_wm_region_view3d(C);
        TextLine *line;
        float offset[3];
-       int linenum= 0;
+       int linenum = 0;
 
        if (!text || !text->lines.first) return;
 
        if (split_lines) {
-               for (line=text->lines.first; line; line=line->next) {
+               for (line = text->lines.first; line; line = line->next) {
                        /* skip lines with no text, but still make space for them */
                        if (line->line[0] == '\0') {
                                linenum++;
@@ -511,9 +511,9 @@ void ED_text_to_object(bContext *C, Text *text, int split_lines)
                }
        }
        else {
-               offset[0]= 0.0f;
-               offset[1]= 0.0f;
-               offset[2]= 0.0f;
+               offset[0] = 0.0f;
+               offset[1] = 0.0f;
+               offset[2] = 0.0f;
 
                txt_add_object(C, text->lines.first, BLI_countlist(&text->lines), offset);
        }
@@ -523,8 +523,8 @@ void ED_text_to_object(bContext *C, Text *text, int split_lines)
 static short next_word(Curve *cu)
 {
        short s;
-       for (s=cu->pos; ((cu->str[s]) && (cu->str[s] != ' ') && (cu->str[s] != '\n') &&
-                        (cu->str[s] != 1) && (cu->str[s] != '\r'));
+       for (s = cu->pos; ((cu->str[s]) && (cu->str[s] != ' ') && (cu->str[s] != '\n') &&
+                          (cu->str[s] != 1) && (cu->str[s] != '\r'));
             s++)
        {
                /* pass */
@@ -537,7 +537,7 @@ static short prev_word(Curve *cu)
 {
        short s;
        
-       if (cu->pos==0) return(0);
+       if (cu->pos == 0) return(0);
        for (s = cu->pos - 2; ((cu->str[s]) && (cu->str[s] != ' ') && (cu->str[s] != '\n') &&
                               (cu->str[s] != 1) && (cu->str[s] != '\r'));
             s--)
@@ -548,10 +548,10 @@ static short prev_word(Curve *cu)
        return cu->str[s] ? (s + 1) : s;
 }
 
-static int kill_selection(Object *obedit, int ins)     /* 1 == new character */
+static int kill_selection(Object *obedit, int ins)  /* 1 == new character */
 {
-       Curve *cu= obedit->data;
-       EditFont *ef= cu->editfont;
+       Curve *cu = obedit->data;
+       EditFont *ef = cu->editfont;
        int selend, selstart, direction;
        int offset = 0;
        int getfrom;
@@ -560,17 +560,17 @@ static int kill_selection(Object *obedit, int ins)        /* 1 == new character */
        if (direction) {
                int size;
                if (ins) offset = 1;
-               if (cu->pos >= selstart) cu->pos = selstart+offset;
+               if (cu->pos >= selstart) cu->pos = selstart + offset;
                if ((direction == -1) && ins) {
                        selstart++;
                        selend++;
                }
-               getfrom = selend+offset;
-               if (ins==0) getfrom++;
-               size = (cu->len * sizeof(wchar_t)) - (selstart * sizeof(wchar_t)) + (offset*sizeof(wchar_t));
-               memmove(ef->textbuf+selstart, ef->textbuf+getfrom, size);
-               memmove(ef->textbufinfo+selstart, ef->textbufinfo+getfrom, ((cu->len-selstart)+offset)*sizeof(CharInfo));
-               cu->len -= (selend-selstart)+offset;
+               getfrom = selend + offset;
+               if (ins == 0) getfrom++;
+               size = (cu->len * sizeof(wchar_t)) - (selstart * sizeof(wchar_t)) + (offset * sizeof(wchar_t));
+               memmove(ef->textbuf + selstart, ef->textbuf + getfrom, size);
+               memmove(ef->textbufinfo + selstart, ef->textbufinfo + getfrom, ((cu->len - selstart) + offset) * sizeof(CharInfo));
+               cu->len -= (selend - selstart) + offset;
                cu->selstart = cu->selend = 0;
        }
 
@@ -579,24 +579,25 @@ static int kill_selection(Object *obedit, int ins)        /* 1 == new character */
 
 /******************* set style operator ********************/
 
-static EnumPropertyItem style_items[]= {
+static EnumPropertyItem style_items[] = {
        {CU_CHINFO_BOLD, "BOLD", 0, "Bold", ""},
        {CU_CHINFO_ITALIC, "ITALIC", 0, "Italic", ""},
        {CU_CHINFO_UNDERLINE, "UNDERLINE", 0, "Underline", ""},
        {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""},
-       {0, NULL, 0, NULL, NULL}};
+       {0, NULL, 0, NULL, NULL}
+};
 
 static int set_style(bContext *C, const int style, const int clear)
 {
-       Object *obedit= CTX_data_edit_object(C);
-       Curve *cu= obedit->data;
-       EditFont *ef= cu->editfont;
+       Object *obedit = CTX_data_edit_object(C);
+       Curve *cu = obedit->data;
+       EditFont *ef = cu->editfont;
        int i, selstart, selend;
 
        if (!BKE_vfont_select_get(obedit, &selstart, &selend))
                return OPERATOR_CANCELLED;
 
-       for (i=selstart; i<=selend; i++) {
+       for (i = selstart; i <= selend; i++) {
                if (clear)
                        ef->textbufinfo[i].flag &= ~style;
                else
@@ -604,15 +605,15 @@ static int set_style(bContext *C, const int style, const int clear)
        }
 
        DAG_id_tag_update(obedit->data, 0);
-       WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
+       WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
 }
 
 static int set_style_exec(bContext *C, wmOperator *op)
 {
-       const int style= RNA_enum_get(op->ptr, "style");
-       const int clear= RNA_boolean_get(op->ptr, "clear");
+       const int style = RNA_enum_get(op->ptr, "style");
+       const int clear = RNA_boolean_get(op->ptr, "clear");
 
        return set_style(C, style, clear);
 }
@@ -629,7 +630,7 @@ void FONT_OT_style_set(wmOperatorType *ot)
        ot->poll = ED_operator_editfont;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        /* properties */
        RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to");
@@ -640,17 +641,17 @@ void FONT_OT_style_set(wmOperatorType *ot)
 
 static int toggle_style_exec(bContext *C, wmOperator *op)
 {
-       Object *obedit= CTX_data_edit_object(C);
-       Curve *cu= obedit->data;
+       Object *obedit = CTX_data_edit_object(C);
+       Curve *cu = obedit->data;
        int style, clear, selstart, selend;
 
        if (!BKE_vfont_select_get(obedit, &selstart, &selend))
                return OPERATOR_CANCELLED;
        
-       style= RNA_enum_get(op->ptr, "style");
+       style = RNA_enum_get(op->ptr, "style");
 
        cu->curinfo.flag ^= style;
-       clear= (cu->curinfo.flag & style) == 0;
+       clear = (cu->curinfo.flag & style) == 0;
 
        return set_style(C, style, clear);
 }
@@ -667,7 +668,7 @@ void FONT_OT_style_toggle(wmOperatorType *ot)
        ot->poll = ED_operator_editfont;
        
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        /* properties */
        RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to");
@@ -680,18 +681,18 @@ static void copy_selection(Object *obedit)
        int selstart, selend;
        
        if (BKE_vfont_select_get(obedit, &selstart, &selend)) {
-               Curve *cu= obedit->data;
-               EditFont *ef= cu->editfont;
+               Curve *cu = obedit->data;
+               EditFont *ef = cu->editfont;
                
-               memcpy(ef->copybuf, ef->textbuf+selstart, ((selend-selstart)+1)*sizeof(wchar_t));
-               ef->copybuf[(selend-selstart)+1]=0;
-               memcpy(ef->copybufinfo, ef->textbufinfo+selstart, ((selend-selstart)+1)*sizeof(CharInfo));      
+               memcpy(ef->copybuf, ef->textbuf + selstart, ((selend - selstart) + 1) * sizeof(wchar_t));
+               ef->copybuf[(selend - selstart) + 1] = 0;
+               memcpy(ef->copybufinfo, ef->textbufinfo + selstart, ((selend - selstart) + 1) * sizeof(CharInfo));
        }
 }
 
 static int copy_text_exec(bContext *C, wmOperator *UNUSED(op))
 {
-       Object *obedit= CTX_data_edit_object(C);
+       Object *obedit = CTX_data_edit_object(C);
 
        copy_selection(obedit);
 
@@ -714,8 +715,8 @@ void FONT_OT_text_copy(wmOperatorType *ot)
 
 static int cut_text_exec(bContext *C, wmOperator *UNUSED(op))
 {
-       Scene *scene= CTX_data_scene(C);
-       Object *obedit= CTX_data_edit_object(C);
+       Scene *scene = CTX_data_scene(C);
+       Object *obedit = CTX_data_edit_object(C);
        int selstart, selend;
 
        if (!BKE_vfont_select_get(obedit, &selstart, &selend))
@@ -741,26 +742,26 @@ void FONT_OT_text_cut(wmOperatorType *ot)
        ot->poll = ED_operator_editfont;
 
        /* flags */
-       ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /******************* paste text operator ********************/
 
 static int paste_selection(Object *obedit, ReportList *reports)
 {
-       Curve *cu= obedit->data;
-       EditFont *ef= cu->editfont;
-       int len= wcslen(ef->copybuf);
+       Curve *cu = obedit->data;
+       EditFont *ef = cu->editfont;
+       int len = wcslen(ef->copybuf);
 
        // Verify that the copy buffer => [copy buffer len] + cu->len < MAXTEXT
        if (cu->len + len <= MAXTEXT) {
                if (len) {      
-                       int size = (cu->len * sizeof(wchar_t)) - (cu->pos*sizeof(wchar_t)) + sizeof(wchar_t);
-                       memmove(ef->textbuf+cu->pos+len, ef->textbuf+cu->pos, size);
-                       memcpy(ef->textbuf+cu->pos, ef->copybuf, len * sizeof(wchar_t));
+                       int size = (cu->len * sizeof(wchar_t)) - (cu->pos * sizeof(wchar_t)) + sizeof(wchar_t);
+                       memmove(ef->textbuf + cu->pos + len, ef->textbuf + cu->pos, size);
+                       memcpy(ef->textbuf + cu->pos, ef->copybuf, len * sizeof(wchar_t));
                
-                       memmove(ef->textbufinfo+cu->pos+len, ef->textbufinfo+cu->pos, (cu->len-cu->pos+1)*sizeof(CharInfo));
-                       memcpy(ef->textbufinfo+cu->pos, ef->copybufinfo, len*sizeof(CharInfo)); 
+                       memmove(ef->textbufinfo + cu->pos + len, ef->textbufinfo +