Cleanup: spelling grey -> gray

diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp
index ffaa4cc45a801aa4b4b6557043db924b857222b2..3b3ab5082c5a0c0253d35d97d85d562ef8e92bc4 100644 (file)
--- a/source/blender/compositor/intern/COM_Debug.cpp
+++ b/source/blender/compositor/intern/COM_Debug.cpp
@@ -356,7 +356,7 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
                        std::string color;
                        switch (from->getDataType()) {
                                case COM_DT_VALUE:
-                                       color = "grey";
+                                       color = "gray";
                                        break;
                                case COM_DT_VECTOR:
                                        color = "blue";

diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index d2dbe961b4277418cd4208231e81b027ea2c2a57..9e38dd5507d056a86bfa399ec9a2074a038d129d 100644 (file)
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -528,7 +528,7 @@ void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel,
                }
                
                /* NOTE: we don't use the straight alpha from the theme, or else effects such as 
-                * greying out protected/muted channels doesn't work correctly! 
+                * graying out protected/muted channels doesn't work correctly!
                 */
                inner_col[3] *= alpha;
                glColor4fv(inner_col);

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index b1bb48b58edb1882931025ec9cd8acf05ac2bab1..4542627277a37f4a32f0a566ce99b027ef57d46f 100644 (file)
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -181,7 +181,7 @@ enum {
        UI_BUT_COLOR_CUBIC     = (1 << 23),  /* cubic saturation for the color wheel */
        UI_BUT_LIST_ITEM       = (1 << 24),  /* This but is "inside" a list item (currently used to change theme colors). */
        UI_BUT_DRAG_MULTI      = (1 << 25),  /* edit this button as well as the active button (not just dragging) */
-       UI_BUT_SCA_LINK_GREY   = (1 << 26),  /* used to flag if sca links shoud be grey out */
+       UI_BUT_SCA_LINK_GREY   = (1 << 26),  /* used to flag if sca links shoud be gray out */
        UI_BUT_HAS_SEP_CHAR    = (1 << 27),  /* but->str contains UI_SEP_CHAR, used for key shortcuts */
        UI_BUT_TIP_FORCE       = (1 << 28),  /* force show tooltips when holding option/alt if U's USER_TOOLTIPS is off */
        UI_BUT_TEXTEDIT_UPDATE = (1 << 29),  /* when widget is in textedit mode, update value on each char stroke */

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index bad09a7c4416bcc797a42d2d1cc27b0df276de04..48a7cf4ecf3e1ef152b4fdf6547b97ab24500224 100644 (file)
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -513,7 +513,7 @@ static void ui_draw_links(uiBlock *block)
        uiBut *but;
        uiLinkLine *line;
 
-       /* Draw the grey out lines. Do this first so they appear at the
+       /* Draw the gray out lines. Do this first so they appear at the
         * bottom of inactive or active lines.
         * As we go, remember if we see any active or selected lines. */
        bool found_selectline = false;
@@ -548,7 +548,7 @@ static void ui_draw_links(uiBlock *block)
        }
 
        /* Draw any active lines (lines with either button being hovered over).
-        * Do this last so they appear on top of inactive and grey out lines. */
+        * Do this last so they appear on top of inactive and gray out lines. */
        if (found_activeline) {
                for (but = block->buttons.first; but; but = but->next) {
                        if (but->type == UI_BTYPE_LINK && but->link) {

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index ae62b61736af5ddda53fcc9afd604ce56937e36c..8d7330c4dd7a5049ff15e65a92b3046560b08e40 100644 (file)
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -241,10 +241,10 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
        /* tone_fg = rgb_to_grayscale(main_color); */
 
        /* mix the colors */
-       rgb_tint(value_color,  0.0f, 0.0f, tone_bg, 0.2f);  /* light grey */
+       rgb_tint(value_color,  0.0f, 0.0f, tone_bg, 0.2f);  /* light gray */
        rgb_tint(active_color, 0.6f, 0.2f, tone_bg, 0.2f);  /* light blue */
-       rgb_tint(normal_color, 0.0f, 0.0f, tone_bg, 0.4f);  /* grey       */
-       rgb_tint(python_color, 0.0f, 0.0f, tone_bg, 0.5f);  /* dark grey  */
+       rgb_tint(normal_color, 0.0f, 0.0f, tone_bg, 0.4f);  /* gray       */
+       rgb_tint(python_color, 0.0f, 0.0f, tone_bg, 0.5f);  /* dark gray  */
        rgb_tint(alert_color,  0.0f, 0.8f, tone_bg, 0.1f);  /* red        */
 
        /* draw text */

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index a9cc53852c0b8f1cd13fae027fd8b871ca3070d3..15e742c930a87a43c966fcea7209d0a9e8423d68 100644 (file)
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1098,7 +1098,7 @@ void ui_theme_init_default(void)
        rgba_char_args_set(btheme->text.syntaxd,    50, 0, 140, 255);   /* Decorator/Preprocessor Dir.  Blue-purple */
        rgba_char_args_set(btheme->text.syntaxr,    140, 60, 0, 255);   /* Reserved  Orange*/
        rgba_char_args_set(btheme->text.syntaxb,    128, 0, 80, 255);   /* Builtin  Red-purple */
-       rgba_char_args_set(btheme->text.syntaxs,    76, 76, 76, 255);   /* Grey (mix between fg/bg) */
+       rgba_char_args_set(btheme->text.syntaxs,    76, 76, 76, 255);   /* Gray (mix between fg/bg) */
        
        /* space oops */
        btheme->toops = btheme->tv3d;
@@ -2351,7 +2351,7 @@ void init_userdef_do_versions(void)
                for (btheme = U.themes.first; btheme; btheme = btheme->next) {
                        rgba_char_args_set(btheme->text.syntaxd,    50, 0, 140, 255);   /* Decorator/Preprocessor Dir.  Blue-purple */
                        rgba_char_args_set(btheme->text.syntaxr,    140, 60, 0, 255);   /* Reserved  Orange */
-                       rgba_char_args_set(btheme->text.syntaxs,    76, 76, 76, 255);   /* Grey (mix between fg/bg) */
+                       rgba_char_args_set(btheme->text.syntaxs,    76, 76, 76, 255);   /* Gray (mix between fg/bg) */
                }
        }
 

diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h
index 577dc0fb86617526f2ff76581ca723ae337f151f..2e78e78421419e52000acfdfdac3295d477ef595 100644 (file)
--- a/source/blender/freestyle/intern/image/Image.h
+++ b/source/blender/freestyle/intern/image/Image.h
@@ -134,7 +134,7 @@ public:
                return _height;
        }
 
-       /*! Returns the grey value for pixel x,y */
+       /*! Returns the gray value for pixel x,y */
        virtual float pixel(unsigned x, unsigned y) const = 0;
 
        /*! Sets the array.