Partial revert of own commits r56604 and r56603:

* Reverted the changes to code comments, as suggested by Campbell. It makes it more hard to follow.
* Only keep changes to actual UI messages.

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 6759e10ab4df0b96da84b659552698bab3b9e455..1bae4ec68cceb2e1378fbb2fb9caccf29ee4e4c2 100644 (file)
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2205,7 +2205,7 @@ static void dag_id_flush_update(Scene *sce, ID *id)
                        }
                }
                
-               /* set flags based on Shape Key */
+               /* set flags based on ShapeKey */
                if (idtype == ID_KE) {
                        for (obt = bmain->object.first; obt; obt = obt->id.next) {
                                Key *key = BKE_key_from_object(obt);

diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index bface916ac389604d97ba391fb677364ef52cdff..10226ade786c12d7e82cf52836d115721e2d56f5 100644 (file)
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -319,7 +319,7 @@ static const char *constraint_adrcodes_to_paths(int adrcode, int *array_index)
        return NULL;
 }
 
-/* Shape Key types 
+/* ShapeKey types 
  * NOTE: as we don't have access to the keyblock where the data comes from (for now), 
  *       we'll just use numerical indices for now...
  */

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 2e5e360a67d95260cadd50f8ea04812dc5670f51..5c25469facc975d9dfdea69290fbd05bbf164fa7 100644 (file)
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1550,7 +1550,7 @@ void BKE_keyblock_copy_settings(KeyBlock *kb_dst, const KeyBlock *kb_src)
        kb_dst->slidermax  = kb_src->slidermax;
 }
 
-/* Get RNA-Path for 'value' setting of the given Shape Key 
+/* Get RNA-Path for 'value' setting of the given ShapeKey 
  * NOTE: the user needs to free the returned string once they're finish with it
  */
 char *BKE_keyblock_curval_rnapath_get(Key *key, KeyBlock *kb)

diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index bdc861e502c808a4dcae693f89c948eebbab31a8..859df2f64a16eada33815ce60bb7a86726e9caf2 100644 (file)
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -372,9 +372,9 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
                                        ar->v2d.align = V2D_ALIGN_NO_POS_Y;
                                        ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
 
-                                       /* for old files with Shape Key editors open + an action set, clear the action as
-                                        * it doesn't make sense in the new system (i.e. violates concept that Shape Key edit
-                                        * only shows Shape Key-rooted actions only)
+                                       /* for old files with ShapeKey editors open + an action set, clear the action as
+                                        * it doesn't make sense in the new system (i.e. violates concept that ShapeKey edit
+                                        * only shows ShapeKey-rooted actions only)
                                         */
                                        if (saction->mode == SACTCONT_SHAPEKEY)
                                                saction->action = NULL;

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 368fc711885be67950c4401a0bb909e51ac1ba48..a441dce565608e692e59a653edcd3aa51ea440b1 100644 (file)
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -464,13 +464,13 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ
        bAnimContext *ac = (bAnimContext *)ale->data;
        
        /* if data is valid, return pointer to active dopesheet's relevant flag 
-        *      - this is restricted to Dope Sheet/Action Editor only
+        *      - 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;
                
-               /* return pointer to Dope Sheet's flag */
+               /* return pointer to DopeSheet's flag */
                return GET_ACF_FLAG_PTR(ads->flag, type);
        }
        else {
@@ -480,7 +480,7 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ
        }
 }
 
-/* all animation summary (Dope Sheet only) type define */
+/* all animation summary (DopeSheet only) type define */
 static bAnimChannelType ACF_SUMMARY = 
 {
        "Summary",                          /* type name */
@@ -843,7 +843,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
                         */
                        return (ac->spacetype == SPACE_IPO) ? 
                               AGRP_EXPANDED_G :        /* Graph Editor case */
-                              AGRP_EXPANDED;           /* Dope Sheet and elsewhere */
+                              AGRP_EXPANDED;           /* DopeSheet and elsewhere */
                }
                        
                case ACHANNEL_SETTING_MUTE: /* muted */
@@ -2346,9 +2346,9 @@ static bAnimChannelType ACF_DSSPK =
        acf_dsspk_setting_ptr                   /* pointer for setting */
 };
 
-/* Shape Key Entry  ------------------------------------------- */
+/* ShapeKey Entry  ------------------------------------------- */
 
-/* name for Shape Key */
+/* name for ShapeKey */
 static void acf_shapekey_name(bAnimListElem *ale, char *name)
 {
        KeyBlock *kb = (KeyBlock *)ale->data;
@@ -2363,7 +2363,7 @@ static void acf_shapekey_name(bAnimListElem *ale, char *name)
        }
 }
 
-/* name property for Shape Key entries */
+/* name property for ShapeKey entries */
 static short acf_shapekey_nameprop(bAnimListElem *ale, PointerRNA *ptr, PropertyRNA **prop)
 {
        KeyBlock *kb = (KeyBlock *)ale->data;
@@ -2817,7 +2817,7 @@ static void ANIM_init_channel_typeinfo_data(void)
                animchannelTypeInfo[type++] = &ACF_DSLAM;        /* Lamp Channel */
                animchannelTypeInfo[type++] = &ACF_DSCAM;        /* Camera Channel */
                animchannelTypeInfo[type++] = &ACF_DSCUR;        /* Curve Channel */
-               animchannelTypeInfo[type++] = &ACF_DSSKEY;       /* Shape Key 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 */
@@ -2829,7 +2829,7 @@ static void ANIM_init_channel_typeinfo_data(void)
                animchannelTypeInfo[type++] = &ACF_DSSPK;        /* Speaker Channel */
                animchannelTypeInfo[type++] = &ACF_DSLINESTYLE;  /* LineStyle Channel */
                
-               animchannelTypeInfo[type++] = &ACF_SHAPEKEY;     /* Shape Key */
+               animchannelTypeInfo[type++] = &ACF_SHAPEKEY;     /* ShapeKey */
                
                animchannelTypeInfo[type++] = &ACF_GPD;          /* Grease Pencil Datablock */
                animchannelTypeInfo[type++] = &ACF_GPL;          /* Grease Pencil Layer */

diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 04e1f05ad7944c8194efa4515c6719ebb6bab1d5..481430f37e487b7f9dd6d730c4617b96502517fe 100644 (file)
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2512,11 +2512,11 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
                        
                        /* select/deselect */
                        if (selectmode == SELECT_INVERT) {
-                               /* inverse selection status of this Shape Key only */
+                               /* inverse selection status of this ShapeKey only */
                                kb->flag ^= KEYBLOCK_SEL;
                        }
                        else {
-                               /* select Shape Key by itself */
+                               /* select ShapeKey by itself */
                                ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
                                kb->flag |= KEYBLOCK_SEL;
                        }

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index ed00261afe72dae1e48549d00146faab94044d7e..d46c0a47c23e602d69cdfad0a359e2b01819344b 100644 (file)
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -99,7 +99,7 @@
 
 /* ----------- Private Stuff - Action Editor ------------- */
 
-/* Get shape key data being edited (for Action Editor -> Shape Key mode) */
+/* Get shapekey data being edited (for Action Editor -> ShapeKey mode) */
 /* Note: there's a similar function in key.c (BKE_key_from_object) */
 static Key *actedit_get_shapekeys(bAnimContext *ac)
 {
@@ -111,7 +111,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac)
        if (ob == NULL) 
                return NULL;
        
-       /* XXX pinning is not available in 'Shape Key' mode... */
+       /* XXX pinning is not available in 'ShapeKey' mode... */
        //if (saction->pin) return NULL;
        
        /* shapekey data is stored with geometry data */
@@ -148,7 +148,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
                        ac->mode = saction->mode;
                        return 1;
                        
-               case SACTCONT_SHAPEKEY: /* 'Shape Key Editor' */
+               case SACTCONT_SHAPEKEY: /* 'ShapeKey Editor' */
                        ac->datatype = ANIMCONT_SHAPEKEY;
                        ac->data = actedit_get_shapekeys(ac);
                        
@@ -191,7 +191,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
                        ac->mode = saction->mode;
                        return 1;
                }
-               case SACTCONT_DOPESHEET: /* Dope Sheet */
+               case SACTCONT_DOPESHEET: /* DopeSheet */
                        /* update scene-pointer (no need to check for pinning yet, as not implemented) */
                        saction->ads.source = (ID *)ac->scene;
                        
@@ -538,7 +538,7 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
                        case ANIMTYPE_SUMMARY:
                        {
                                /* nothing to include for now... this is just a dummy wrappy around all the other channels 
-                                * in the Dope Sheet, and gets included at the start of the list
+                                * in the DopeSheet, and gets included at the start of the list
                                 */
                                ale->key_data = NULL;
                                ale->datatype = ALE_ALL;
@@ -1331,7 +1331,7 @@ static size_t animfilter_block_data(bAnimContext *ac, ListBase *anim_data, bDope
 
 
 
-/* Include Shape Key Data for Shape Key Editor */
+/* Include ShapeKey Data for ShapeKey Editor */
 static size_t animdata_filter_shapekey(bAnimContext *ac, ListBase *anim_data, Key *key, int filter_mode)
 {
        size_t items = 0;
@@ -1340,7 +1340,7 @@ static size_t animdata_filter_shapekey(bAnimContext *ac, ListBase *anim_data, Ke
        if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
                KeyBlock *kb;
                
-               /* loop through the channels adding Shape Keys as appropriate */
+               /* loop through the channels adding ShapeKeys as appropriate */
                for (kb = key->block.first; kb; kb = kb->next) {
                        /* skip the first one, since that's the non-animatable basis */
                        if (kb == key->block.first) continue;
@@ -2339,14 +2339,14 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
        return items;
 }
 
-/* Summary track for Dope Sheet/Action Editor 
+/* Summary track for DopeSheet/Action Editor 
  *  - return code is whether the summary lets the other channels get drawn
  */
 static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_data, int filter_mode, size_t *items)
 {
        bDopeSheet *ads = NULL;
        
-       /* get the Dope Sheet information to use 
+       /* get the DopeSheet information to use 
         *      - we should only need to deal with the DopeSheet/Action Editor, 
         *        since all the other Animation Editors won't have this concept
         *        being applicable.
@@ -2362,7 +2362,7 @@ static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_
        
        /* dopesheet summary 
         *      - only for drawing and/or selecting keyframes in channels, but not for real editing 
-        *      - only useful for Dope Sheet/Action/etc. editors where it is actually useful
+        *      - only useful for DopeSheet/Action/etc. editors where it is actually useful
         */
        if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && (ads->filterflag & ADS_FILTER_SUMMARY)) {
                bAnimListElem *ale = make_new_animlistelem(ac, ANIMTYPE_SUMMARY, NULL);
@@ -2384,7 +2384,7 @@ static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_
 
 /* ......................... */
 
-/* filter data associated with a channel - usually for handling summary-channels in Dope Sheet */
+/* filter data associated with a channel - usually for handling summary-channels in DopeSheet */
 static size_t animdata_filter_animchan(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, bAnimListElem *channel, int filter_mode)
 {
        size_t items = 0;
@@ -2499,15 +2499,15 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
                                SpaceAction *saction = (SpaceAction *)ac->sl;
                                bDopeSheet *ads = (saction) ? &saction->ads : NULL;
                                
-                               /* the check for the Dope Sheet summary is included here since the summary works here too */
+                               /* the check for the DopeSheet summary is included here since the summary works here too */
                                if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
                                        items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact);
                        }
                        break;
                        
-                       case ANIMCONT_SHAPEKEY: /* 'Shape Key Editor' */
+                       case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */
                        {
-                               /* the check for the Dope Sheet summary is included here since the summary works here too */
+                               /* the check for the DopeSheet summary is included here since the summary works here too */
                                if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
                                        items = animdata_filter_shapekey(ac, anim_data, data, filter_mode);
                        }
@@ -2527,9 +2527,9 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
                        }
                        break;
                        
-                       case ANIMCONT_DOPESHEET: /* 'Dope Sheet Editor' */
+                       case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */
                        {
-                               /* the Dope Sheet editor is the primary place where the Dope Sheet summaries are useful */
+                               /* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
                                if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
                                        items += animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
                        }
@@ -2539,7 +2539,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
                        case ANIMCONT_DRIVERS: /* Graph Editor -> Drivers Editing */
                        case ANIMCONT_NLA:     /* NLA Editor */
                        {
-                               /* all of these editors use the basic Dope Sheet data for filtering options, but don't have all the same features */
+                               /* all of these editors use the basic DopeSheet data for filtering options, but don't have all the same features */
                                items = animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
                        }
                        break;

diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index cf141c8c08880b958820374bc9ddf078c8cca253..d9d2180e184e558c5f78ece6b88388d1cc3fa1c0 100644 (file)
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -672,7 +672,7 @@ static void draw_keylist(View2D *v2d, DLRBT_Tree *keys, DLRBT_Tree *blocks, floa
        
        /* draw keys */
        if (keys) {
-               /* locked channels are less strongly shown, as feedback for locked channels in Dope Sheet */
+               /* locked channels are less strongly shown, as feedback for locked channels in DopeSheet */
                /* TODO: allow this opacity factor to be themed? */
                float kalpha = (channelLocked) ? 0.25f : 1.0f;
                

diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 25051472dbafc9935917f802155672f29bbd4226..decbc351cad3fa04edae66182aad209a7e16012c 100644 (file)
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -345,7 +345,7 @@ short ANIM_animchannel_keyframes_loop(KeyframeEditData *ked, bDopeSheet *ads, bA
                        return ob_keyframes_loop(ked, ads, (Object *)ale->key_data, key_ok, key_cb, fcu_cb);
                case ALE_SCE: /* scene */
                        return scene_keyframes_loop(ked, ads, (Scene *)ale->data, key_ok, key_cb, fcu_cb);
-               case ALE_ALL: /* 'all' (Dope Sheet summary) */
+               case ALE_ALL: /* 'all' (DopeSheet summary) */
                        return summary_keyframes_loop(ked, (bAnimContext *)ale->data, key_ok, key_cb, fcu_cb);
        }
        
@@ -377,7 +377,7 @@ short ANIM_animchanneldata_keyframes_loop(KeyframeEditData *ked, bDopeSheet *ads
                        return ob_keyframes_loop(ked, ads, (Object *)data, key_ok, key_cb, fcu_cb);
                case ALE_SCE: /* scene */
                        return scene_keyframes_loop(ked, ads, (Scene *)data, key_ok, key_cb, fcu_cb);
-               case ALE_ALL: /* 'all' (Dope Sheet summary) */
+               case ALE_ALL: /* 'all' (DopeSheet summary) */
                        return summary_keyframes_loop(ked, (bAnimContext *)data, key_ok, key_cb, fcu_cb);
        }
        

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index b64431d5a6b8d782c8d19e5bc9cbf98f125a2c4d..f698f9b0b11711253247ec076447fc3022761e00 100644 (file)
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -78,7 +78,7 @@ typedef struct bAnimContext {
        struct SpaceLink *sl;   /* editor data */
        struct ARegion *ar;     /* region within editor */
        
-       struct bDopeSheet *ads; /* dope sheet data for editor (or which is being used) */
+       struct bDopeSheet *ads; /* dopesheet data for editor (or which is being used) */
        
        struct Scene *scene;    /* active scene */
        struct Object *obact;   /* active object */
@@ -275,7 +275,7 @@ typedef enum eAnimFilter_Flags {
 #define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED) == 0)
 #define SEL_FCU(fcu) (fcu->flag & FCURVE_SELECTED)
 
-/* Shape Key mode only */
+/* ShapeKey mode only */
 #define EDITABLE_SHAPEKEY(kb) ((kb->flag & KEYBLOCK_LOCKED) == 0)
 #define SEL_SHAPEKEY(kb) (kb->flag & KEYBLOCK_SEL)
 

diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 5ffa617d8f5ddc4d2c6ab5df6d540d7db4b4c01d..ffee46e30c6b8de6fb7d136e884d84a7fd280ab5 100644 (file)
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -118,7 +118,7 @@ void draw_action_channel(struct View2D *v2d, struct AnimData *adt, struct bActio
 void draw_object_channel(struct View2D *v2d, struct bDopeSheet *ads, struct Object *ob, float ypos);
 /* Scene Summary */
 void draw_scene_channel(struct View2D *v2d, struct bDopeSheet *ads, struct Scene *sce, float ypos);
-/* Dope Sheet Summary */
+/* DopeSheet Summary */
 void draw_summary_channel(struct View2D *v2d, struct bAnimContext *ac, float ypos);
 /* Grease Pencil Layer */ 
 // XXX not restored 
@@ -137,7 +137,7 @@ void action_to_keylist(struct AnimData *adt, struct bAction *act, struct DLRBT_T
 void ob_to_keylist(struct bDopeSheet *ads, struct Object *ob, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
 /* Scene */
 void scene_to_keylist(struct bDopeSheet *ads, struct Scene *sce, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
-/* Dope Sheet Summary */
+/* DopeSheet Summary */
 void summary_to_keylist(struct bAnimContext *ac, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
 /* Grease Pencil Layer */
 // XXX not restored

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 79295f87ea8bb03b74dc7c5337828b34932fcd08..c72d16221a88dc486f1834931b0970acb3423b8c 100644 (file)
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1609,10 +1609,10 @@ void init_userdef_do_versions(void)
                                btheme->tima.facedot_size = 2;
                        }
                        
-                       /* Dope Sheet - (Object) Channel color */
+                       /* DopeSheet - (Object) Channel color */
                        rgba_char_args_set(btheme->tact.ds_channel,     82, 96, 110, 255);
                        rgba_char_args_set(btheme->tact.ds_subchannel,  124, 137, 150, 255);
-                       /* Dope Sheet - Group Channel color (saner version) */
+                       /* DopeSheet - Group Channel color (saner version) */
                        rgba_char_args_set(btheme->tact.group, 79, 101, 73, 255);
                        rgba_char_args_set(btheme->tact.group_active, 135, 177, 125, 255);
                        
@@ -1959,7 +1959,7 @@ void init_userdef_do_versions(void)
                bTheme *btheme;
                
                for (btheme = U.themes.first; btheme; btheme = btheme->next) {
-                       /* Dope Sheet Summary */
+                       /* DopeSheet Summary */
                        rgba_char_args_set(btheme->tact.anim_active,    204, 112, 26, 102); 
                        
                        /* NLA Colors */

diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index a955593b91a8ee4c5169858a0e81a90bb99739b2..3f9737b3c5d3ccdf43397c4d01ea18b9191fe7d4 100644 (file)
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -103,7 +103,7 @@ static SpaceLink *graph_new(const bContext *C)
        
        sipo->autosnap = SACTSNAP_FRAME;
        
-       /* allocate Dope Sheet data for Graph Editor */
+       /* allocate DopeSheet data for Graph Editor */
        sipo->ads = MEM_callocN(sizeof(bDopeSheet), "GraphEdit DopeSheet");
        sipo->ads->source = (ID *)scene;
        

diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
index 00f70fd95767c06356d15951b95bf75b331db337..b3d8d5d5aadf031a898907e792450f075c071fce 100644 (file)
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -101,7 +101,7 @@ static SpaceLink *nla_new(const bContext *C)
        snla = MEM_callocN(sizeof(SpaceNla), "initnla");
        snla->spacetype = SPACE_NLA;
        
-       /* allocate Dope Sheet data for NLA Editor */
+       /* allocate DopeSheet data for NLA Editor */
        snla->ads = MEM_callocN(sizeof(bDopeSheet), "NlaEdit DopeSheet");
        snla->ads->source = (ID *)scene;
        

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index a3e646db124a02652f9c6c1b014a9c0f46bc16e0..eded0b4b76e0cf6ba794fd73bf5f9be2c7c18baa 100644 (file)
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -455,7 +455,7 @@ typedef enum eActionGroup_Flag {
        AGRP_ACTIVE     = (1 << 1),
        /* keyframes/channels belonging to it cannot be edited */
        AGRP_PROTECTED  = (1 << 2),
-       /* for UI (Dope Sheet), sub-channels are shown */
+       /* for UI (DopeSheet), sub-channels are shown */
        AGRP_EXPANDED   = (1 << 3),
        /* sub-channels are not evaluated */
        AGRP_MUTED      = (1 << 4),
@@ -529,7 +529,7 @@ typedef struct bDopeSheet {
 } bDopeSheet;
 
 
-/* Dope Sheet filter-flag */
+/* DopeSheet filter-flag */
 typedef enum eDopeSheet_FilterFlag {
        /* general filtering */
        ADS_FILTER_ONLYSEL          = (1 << 0),   /* only include channels relating to selected data */
@@ -540,7 +540,7 @@ typedef enum eDopeSheet_FilterFlag {
        ADS_FILTER_SELEDIT          = (1 << 3),   /* for Graph Editor - used to indicate whether to include a filtering flag or not */
 
        /* general filtering 2 */
-       ADS_FILTER_SUMMARY          = (1 << 4),   /* for 'Dope Sheet' Editors - include 'summary' line */
+       ADS_FILTER_SUMMARY          = (1 << 4),   /* for 'DopeSheet' Editors - include 'summary' line */
        ADS_FILTER_ONLYOBGROUP      = (1 << 5),   /* only the objects in the specified object group get used */
 
        /* datatype-based filtering */

diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 454e854b38a6b81a6bf9689efc4e8c4c345a1200..f915b7e1cc0bcc9904fc4bae139733fb69999f51 100644 (file)
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -266,9 +266,9 @@ static void rna_def_dopesheet(BlenderRNA *brna)
 
        srna = RNA_def_struct(brna, "DopeSheet", NULL);
        RNA_def_struct_sdna(srna, "bDopeSheet");
-       RNA_def_struct_ui_text(srna, "DopeSheet", "Settings for filtering the channels shown in animation editors");
+       RNA_def_struct_ui_text(srna, "Dope Sheet", "Settings for filtering the channels shown in animation editors");
        
-       /* Source of Dope Sheet data */
+       /* Source of DopeSheet data */
        /* XXX: make this obsolete? */
        prop = RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE);
        RNA_def_property_struct_type(prop, "ID");
@@ -338,7 +338,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
-       /* Summary Settings (Dope Sheet editors only) */
+       /* Summary Settings (DopeSheet editors only) */
        prop = RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY);
        RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (Dope Sheet editors only)");

diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index a0e281f328a0ad6fd1c5411bc3568937cc201f99..21ced71348fe13dc567a78d165cc539d4dc4a34c 100644 (file)
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -655,7 +655,7 @@ static void rna_def_mask_layer(BlenderRNA *brna)
        RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
        RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
 
-       /* select (for Dope Sheet)*/
+       /* select (for dopesheet)*/
        prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", MASK_LAYERFLAG_SELECT);
        RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the Dope Sheet");

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index f0fa1db44854cf62696ed0b24b40c994cbb65995..a4e532660f127436e5a993eb39da2224a38e8a0e 100644 (file)
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -480,7 +480,7 @@ void RNA_api_object(StructRNA *srna)
        parm = RNA_def_pointer(func, "ob_arm", "Object", "", "Armature object influencing this object or NULL");
        RNA_def_function_return(func, parm);
 
-       /* Shape Key */
+       /* Shape key */
        func = RNA_def_function(srna, "shape_key_add", "rna_Object_shape_key_add");
        RNA_def_function_ui_description(func, "Add shape key to an object");
        RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 58e1468136ef143a0479893bec69afa892b273ca..44942db95b9cc035b9812ab6ff2e929e06d7975f 100644 (file)
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -935,7 +935,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *sce
        SpaceAction *saction = (SpaceAction *)(ptr->data);
        Object *obact = (scene->basact) ? scene->basact->object : NULL;
        
-       /* special exceptions for Shape Key Editor mode */
+       /* special exceptions for ShapeKey Editor mode */
        if (saction->mode == SACTCONT_SHAPEKEY) {
                Key *key = BKE_key_from_object(obact);
                
@@ -946,7 +946,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *sce
                        saction->action = NULL;
                
                /* 2)   enable 'show sliders' by default, since one of the main
-                *              points of the Shape Key Editor is to provide a one-stop shop
+                *              points of the ShapeKey Editor is to provide a one-stop shop
                 *              for controlling the shapekeys, whose main control is the value
                 */
                saction->flag |= SACTION_SLIDERS;
@@ -2739,7 +2739,7 @@ static void rna_def_space_graph(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL);
 
-       /* Dope Sheet */
+       /* dopesheet */
        prop = RNA_def_property(srna, "dopesheet", PROP_POINTER, PROP_NONE);
        RNA_def_property_struct_type(prop, "DopeSheet");
        RNA_def_property_pointer_sdna(prop, NULL, "ads");