More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normal...
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 3 Jul 2012 19:09:07 +0000 (19:09 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 3 Jul 2012 19:09:07 +0000 (19:09 +0000)
53 files changed:
doc/python_api/rst/bge.types.rst
release/scripts/startup/bl_ui/properties_data_armature.py
release/scripts/startup/bl_ui/properties_object.py
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenlib/intern/math_color_inline.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poseSlide.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/cineon/cineon_dpx.c
source/blender/imbuf/intern/jp2.c
source/blender/imbuf/intern/tiff.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_armature_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesrna/intern/rna_animviz.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_ui.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/intern/node_socket.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_window.c
source/gameengine/Ketsji/KX_Dome.cpp

index f7bdb06e58c14d3a2ca8e399c92dc4a7092121fe..b45d1a035580c8a827e76b6f3ce8276dfaa3a791 100644 (file)
@@ -3574,7 +3574,7 @@ Game Types (bge.types)
 
       Gets the normal vector of this vertex.
 
-      :return: normalised normal vector.
+      :return: normalized normal vector.
       :rtype: list [nx, ny, nz]
 
    .. method:: setNormal(normal)
index 11feaeeeab5c7cc98bc18b14cc2457e92a6d2c76..03aa41bb9aac2153b187a64d7c993318e173e306 100644 (file)
@@ -304,7 +304,7 @@ class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel):
         layout = self.layout
 
         ob = context.object
-        avs = ob.pose.animation_visualisation
+        avs = ob.pose.animation_visualization
 
         pchan = context.active_pose_bone
         mpath = pchan.motion_path if pchan else None
@@ -323,7 +323,7 @@ class DATA_PT_onion_skinning(OnionSkinButtonsPanel):  # , Panel): # inherit from
 
     def draw(self, context):
         ob = context.object
-        self.draw_settings(context, ob.pose.animation_visualisation, bones=True)
+        self.draw_settings(context, ob.pose.animation_visualization, bones=True)
 
 
 class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel):
index 4ce909d3645f28588cc17fb688e97c862d2ac327..86fc1dac4fcda741cbc5dcb8a9a3cdd9abe0804e 100644 (file)
@@ -309,7 +309,7 @@ class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel):
         layout = self.layout
 
         ob = context.object
-        avs = ob.animation_visualisation
+        avs = ob.animation_visualization
         mpath = ob.motion_path
 
         self.draw_settings(context, avs, mpath)
@@ -326,7 +326,7 @@ class OBJECT_PT_onion_skinning(OnionSkinButtonsPanel):  # , Panel): # inherit fr
     def draw(self, context):
         ob = context.object
 
-        self.draw_settings(context, ob.animation_visualisation)
+        self.draw_settings(context, ob.animation_visualization)
 
 
 class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, Panel):
index d605776ed50da8852b74252a8670aa86cf15439d..acb9234b2d44c26574b1d9f774a09af08bf703d2 100644 (file)
@@ -43,7 +43,7 @@ struct bPoseChannel;
 struct ReportList;
 
 /* ---------------------------------------------------- */
-/* Animation Visualisation */
+/* Animation Visualization */
 
 void animviz_settings_init(struct bAnimVizSettings *avs);
 
index a0cfc4295ef4f48a8d68befefb074c3362955171..52399801691ff26d6307444f55a4187921420842 100644 (file)
@@ -78,9 +78,9 @@
 static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBase *duplilist, float par_space_mat[][4], int par_index, int level, int animated);
 
 /* ******************************************************************** */
-/* Animation Visualisation */
+/* Animation Visualization */
 
-/* Initialize the default settings for animation visualisation */
+/* Initialize the default settings for animation visualization */
 void animviz_settings_init(bAnimVizSettings *avs)
 {
        /* sanity check */
index a0da23a8f8fcbbb0917450fdf44be8c971976f2f..943bad35cf27573c28c6ad3369caa7ab760e67e6 100644 (file)
@@ -1857,7 +1857,7 @@ static void nlastrip_evaluate_transition(PointerRNA *ptr, ListBase *channels, Li
        /* prepare template for 'evaluation strip' 
         *      - based on the transition strip's evaluation strip data
         *      - strip_mode is NES_TIME_TRANSITION_* based on which endpoint
-        *      - strip_time is the 'normalised' (i.e. in-strip) time for evaluation,
+        *      - strip_time is the 'normalized' (i.e. in-strip) time for evaluation,
         *        which doubles up as an additional weighting factor for the strip influences
         *        which allows us to appear to be 'interpolating' between the two extremes
         */
index 96959398bc2e9d1449752abd9faa89561512a67a..5822b296a8aec73deade57466f39be8fc8de8596 100644 (file)
@@ -2207,7 +2207,7 @@ void BKE_pchan_to_mat4(bPoseChannel *pchan, float chan_mat[4][4])
                axis_angle_to_mat3(rmat, pchan->rotAxis, pchan->rotAngle);
        }
        else {
-               /* quats are normalised before use to eliminate scaling issues */
+               /* quats are normalized before use to eliminate scaling issues */
                float quat[4];
 
                /* NOTE: we now don't normalize the stored values anymore, since this was kindof evil in some cases
index 692c696803d5f8eca5bffc88bca15dcdcbc10499..a1553a24ad208592d906e323495f6510a93f67c2 100644 (file)
@@ -662,15 +662,15 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                                /* note that this relation actually runs in the wrong direction, the problem
                                 * is that dupli system all have this (due to parenting), and the render
                                 * engine instancing assumes particular ordering of objects in list */
-                               dag_add_relation(dag, node, node2, DAG_RL_OB_OB, "Particle Object Visualisation");
+                               dag_add_relation(dag, node, node2, DAG_RL_OB_OB, "Particle Object Visualization");
                                if (part->dup_ob->type == OB_MBALL)
-                                       dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA, "Particle Object Visualisation");
+                                       dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA, "Particle Object Visualization");
                        }
 
                        if (part->ren_as == PART_DRAW_GR && part->dup_group) {
                                for (go = part->dup_group->gobject.first; go; go = go->next) {
                                        node2 = dag_get_node(dag, go->ob);
-                                       dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Particle Group Visualisation");
+                                       dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Particle Group Visualization");
                                }
                        }
 
index a6467af2773d013c35ec73c918f79d4250e80759..dd5751c5d1f26c109e4818be912c317b5228d190 100644 (file)
@@ -1686,7 +1686,7 @@ struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd,
                                                                                                c[1] = material->g;
                                                                                                c[2] = material->b;
                                                                                        }
-                                                                                       else { /* default grey */
+                                                                                       else { /* default gray */
                                                                                                c[0] = 0.65f;
                                                                                                c[1] = 0.65f;
                                                                                                c[2] = 0.65f;
index b7ede15d00bbaac27fcbf03f007918374405bc3b..f981ecaf81033b33bcc9a5de6ed59dce5027825b 100644 (file)
@@ -285,7 +285,7 @@ static FModifierTypeInfo FMI_GENERATOR = {
  * x is the evaluation 'time', and 'y' is the resultant value
  *
  * Functions available are
- *     sin, cos, tan, sinc (normalised sin), natural log, square root 
+ *     sin, cos, tan, sinc (normalized sin), natural log, square root 
  */
 
 static void fcm_fn_generator_new_data(void *mdata)
@@ -297,7 +297,7 @@ static void fcm_fn_generator_new_data(void *mdata)
        data->phase_multiplier = 1.0f;
 }
 
-/* Unary 'normalised sine' function
+/* Unary 'normalized sine' function
  *  y = sin(PI + x) / (PI * x),
  * except for x = 0 when y = 1.
  */
@@ -326,7 +326,7 @@ static void fcm_fn_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float
                case FCM_GENERATOR_FN_COS: /* cosine wave */
                        fn = cos;
                        break;
-               case FCM_GENERATOR_FN_SINC: /* normalised sine wave */
+               case FCM_GENERATOR_FN_SINC: /* normalized sine wave */
                        fn = sinc;
                        break;
                        
index ac0728327072848ee2e8500afc8fd7895be648ad..23f197155a12586381fbcb8511e413dd5b890e73 100644 (file)
@@ -1107,19 +1107,19 @@ static char colname_array[125][20]= {
 "LightGreen", "Chartreuse", "YellowGreen", "Yellow", "Gold",
 "Green", "LawnGreen", "GreenYellow", "LightOlive", "Yellow",
 "DarkBlue", "DarkPurple", "HotPink", "VioletPink", "RedPink",
-"SlateGray", "DarkGrey", "PalePurple", "IndianRed", "Tomato",
+"SlateGray", "DarkGray", "PalePurple", "IndianRed", "Tomato",
 "SeaGreen", "PaleGreen", "GreenKhaki", "LightBrown", "LightSalmon",
 "SpringGreen", "PaleGreen", "MediumOlive", "YellowBrown", "LightGold",
 "LightGreen", "LightGreen", "LightGreen", "GreenYellow", "PaleYellow",
 "HalfBlue", "DarkSky", "HalfMagenta", "VioletRed", "DeepPink",
 "SteelBlue", "SkyBlue", "Orchid", "LightHotPink", "HotPink",
-"SeaGreen", "SlateGray", "MediumGrey", "Burlywood", "LightPink",
+"SeaGreen", "SlateGray", "MediumGray", "Burlywood", "LightPink",
 "SpringGreen", "Aquamarine", "PaleGreen", "Khaki", "PaleOrange",
 "SpringGreen", "SeaGreen", "PaleGreen", "PaleWhite", "YellowWhite",
 "LightBlue", "Purple", "MediumOrchid", "Magenta", "Magenta",
 "RoyalBlue", "SlateBlue", "MediumOrchid", "Orchid", "Magenta",
 "DeepSkyBlue", "LightSteelBlue", "LightSkyBlue", "Violet", "LightPink",
-"Cyan", "DarkTurquoise", "SkyBlue", "Grey", "Snow",
+"Cyan", "DarkTurquoise", "SkyBlue", "Gray", "Snow",
 "Mint", "Mint", "Aquamarine", "MintCream", "Ivory",
 "Blue", "Blue", "DarkMagenta", "DarkOrchid", "Magenta",
 "SkyBlue", "RoyalBlue", "LightSlateBlue", "MediumOrchid", "Magenta",
index b182a7308ac2edc0d32e310e3eb6080434bf407f..f0d477913742a3182611d0f897d7b21243e63950 100644 (file)
@@ -843,7 +843,7 @@ Object *BKE_object_add_only_object(int type, const char *name)
 
        ob->pc_ids.first = ob->pc_ids.last = NULL;
        
-       /* Animation Visualisation defaults */
+       /* Animation Visualization defaults */
        animviz_settings_init(&ob->avs);
 
        return ob;
@@ -1460,7 +1460,7 @@ void BKE_object_rot_to_mat3(Object *ob, float mat[][3])
                axis_angle_to_mat3(dmat, ob->drotAxis, ob->drotAngle);
        }
        else {
-               /* quats are normalised before use to eliminate scaling issues */
+               /* quats are normalized before use to eliminate scaling issues */
                float tquat[4];
                
                normalize_qt_qt(tquat, ob->quat);
index 3dea8a85915e68caa322ac5437f1189dca419dc9..6167536fb9baa8f87460d50558180db0020f3bb4 100644 (file)
@@ -3028,9 +3028,9 @@ static unsigned char *detect_get_frame_ucharbuf(ImBuf *ibuf)
 
                        if (ibuf->rect_float) {
                                const float *rrgbf = ibuf->rect_float + pixel * 4;
-                               const float grey_f = 0.2126f * rrgbf[0] + 0.7152f * rrgbf[1] + 0.0722f * rrgbf[2];
+                               const float gray_f = 0.2126f * rrgbf[0] + 0.7152f * rrgbf[1] + 0.0722f * rrgbf[2];
 
-                               *cp = FTOCHAR(grey_f);
+                               *cp = FTOCHAR(gray_f);
                        }
                        else {
                                const unsigned char *rrgb = (unsigned char *)ibuf->rect + pixel * 4;
index 58ee898ea289d86d2a1cde264593e5100a6c3247..a3835b5bb4a4228dec30c872d3a1f6f3984eded6 100644 (file)
@@ -225,7 +225,7 @@ MINLINE void cpack_cpy_3ub(unsigned char r_col[3], const unsigned int pack)
 /* TODO:
  *
  * regarding #rgb_to_bw vs #rgb_to_grayscale,
- * it seems nobody knows why we have both functions which convert color to greys
+ * it seems nobody knows why we have both functions which convert color to grays
  * but with different influences, this is quite stupid, and should be resolved
  * by someone who knows this stuff: see this thread
  * http://lists.blender.org/pipermail/bf-committers/2012-June/037180.html
index d4755fc95cdccef15425127b30cbebecfa9109d7..6cef843d8280b3b745f2eebad03f5ed93e0e7377 100644 (file)
@@ -4563,7 +4563,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
                                        DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
                                }
                        }
-                       /* if there are some dependencies for visualising armature state 
+                       /* if there are some dependencies for visualizing armature state 
                         * (e.g. Mask Modifier in 'Armature' mode), force update 
                         */
                        else if (arm->flag & ARM_HAS_VIZ_DEPS) {
index 824a39374fd8b6b5ad8ca7cac74d1beaaa9cb747..5170079379112538f9e14305bd1681eb5b6f2636 100644 (file)
@@ -220,7 +220,7 @@ static void pose_slide_apply_val(tPoseSlideOp *pso, FCurve *fcu, float *val)
        else {
                /*      - these weights are derived from the relative distance of these 
                 *        poses from the current frame
-                *      - they then get normalised so that they only sum up to 1
+                *      - they then get normalized so that they only sum up to 1
                 */
                float wtot; 
                
index d26c8cefdf07b11fffa9a0c508fd99590ae4e44d..e0ab6542922d043a82694dbd95164ffe35fa47cf 100644 (file)
@@ -919,7 +919,7 @@ void uiEndBlock(const bContext *C, uiBlock *block)
                if (ui_but_update_from_old_block(C, block, &but))
                        ui_check_but(but);
                
-               /* temp? Proper check for greying out */
+               /* temp? Proper check for graying out */
                if (but->optype) {
                        wmOperatorType *ot = but->optype;
 
index b5b3edffe568e1d9ed4bec998540600bcd8b299f..e6a4c260d0f530a3cb9a631189375d825d893378 100644 (file)
@@ -1051,7 +1051,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
                 *      as that poses problems when restoring them, so disable the "up" button where
                 *      it may cause this situation. 
                 *
-                *  Up/Down buttons should only be shown (or not greyed - todo) if they serve some purpose.
+                *  Up/Down buttons should only be shown (or not grayed - todo) if they serve some purpose.
                 */
                if (proxylocked_constraints_owner(ob, pchan)) {
                        if (con->prev) {
@@ -2679,7 +2679,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
        but->col[3] = 255;
 
        but = uiDefBut(block, ROUNDBOX, 0, "", UI_UNIT_X + 10, 0, UI_UNIT_X + width, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "");
-       but->col[0] = but->col[1] = but->col[2] = FTOCHAR(rti->greyscale);
+       but->col[0] = but->col[1] = but->col[2] = FTOCHAR(rti->grayscale);
        but->col[3] = 255;
 
        uiBlockEndAlign(block);
index 83337a18223d0713a3440c847ce7fe52fc44ee62..f080b9f96e7871c105e867c31f8720cac81be130 100644 (file)
@@ -192,9 +192,9 @@ static void draw_spline_points(MaskLayer *masklay, MaskSpline *spline,
 
                        /* this could be split into its own loop */
                        if (draw_type == MASK_DT_OUTLINE) {
-                               const unsigned char rgb_grey[4] = {0x60, 0x60, 0x60, 0xff};
+                               const unsigned char rgb_gray[4] = {0x60, 0x60, 0x60, 0xff};
                                glLineWidth(3);
-                               glColor4ubv(rgb_grey);
+                               glColor4ubv(rgb_gray);
                                glBegin(GL_LINES);
                                glVertex3fv(vert);
                                glVertex3fv(handle);
index de3d2d4e871819085ada58319a2af75d9be58114..d37a16cb1bb9dfb6c5fffade41fabbd8317d84e8 100644 (file)
@@ -518,7 +518,7 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
        ibuf = BKE_image_acquire_ibuf(oglrender->ima, &oglrender->iuser, &lock);
 
        if (ibuf) {
-               /* color -> greyscale */
+               /* color -> grayscale */
                /* editing directly would alter the render view */
                if (scene->r.im_format.planes == R_IMF_PLANES_BW) {
                        ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
index 3533a337aa180ef9d2a7fdd5f5b27d3906668b44..a638aac94231223d71853b3699dc06b026208c8f 100644 (file)
@@ -862,7 +862,7 @@ static void draw_join_shape(ScrArea *sa, char dir)
                draw_horizontal_join_shape(sa, dir);
 }
 
-/* draw screen area darker with arrow (visualisation of future joining) */
+/* draw screen area darker with arrow (visualization of future joining) */
 static void scrarea_draw_shape_dark(ScrArea *sa, char dir)
 {
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
index e76edcf0290c30701673bbceef7836983fc4324e..9d1f52568b42776cebfa0c6d31cb584c1a413e91 100644 (file)
@@ -654,7 +654,7 @@ void CLIP_OT_view_zoom_out(wmOperatorType *ot)
 
        /* properties */
        RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location",
-                            "Cursor location in normalised (0.0-1.0) coordinates", -10.0f, 10.0f);
+                            "Cursor location in normalized (0.0-1.0) coordinates", -10.0f, 10.0f);
 }
 
 /********************** view zoom ratio operator *********************/
index ddca0030cf5003c5d82537cb45641c304818b152..9c422889feb5fb105fadec7ec36b30330c125153 100644 (file)
@@ -851,7 +851,7 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGrid
                                setlinestyle(2);
                        }
                        if ( ((fcu->grp) && (fcu->grp->flag & AGRP_MUTED)) || (fcu->flag & FCURVE_MUTED) ) {
-                               /* muted curves are drawn in a greyish hue */
+                               /* muted curves are drawn in a grayish hue */
                                // XXX should we have some variations?
                                UI_ThemeColorShade(TH_HEADER, 50);
                        }
index 080f12bf35bbd95c9d8353bc79e157c5d2971604..33a2d5c18c5359eb3c9bc286fcc10da93e2c42db 100644 (file)
@@ -340,7 +340,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm
        ReportTimerInfo *rti;
        float progress = 0.0, color_progress = 0.0;
        float neutral_col[3] = {0.35, 0.35, 0.35};
-       float neutral_grey = 0.6;
+       float neutral_gray = 0.6;
        float timeout = 0.0, color_timeout = 0.0;
        int send_note = 0;
        
@@ -385,7 +385,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm
                        rti->col[1] = 0.45;
                        rti->col[2] = 0.7;
                }
-               rti->greyscale = 0.75;
+               rti->grayscale = 0.75;
                rti->widthfac = 1.0;
        }
        
@@ -398,7 +398,7 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wm
                
                /* fade colors out sharply according to progress through fade-out duration */
                interp_v3_v3v3(rti->col, rti->col, neutral_col, color_progress);
-               rti->greyscale = interpf(neutral_grey, rti->greyscale, color_progress);
+               rti->grayscale = interpf(neutral_gray, rti->grayscale, color_progress);
        }
 
        /* collapse report at end of timeout */
index 7eb0f676707844cc061e81d6f71086a031a27f72..92f014fd80403ebbe9106c2b49c952a82a80d698 100644 (file)
@@ -89,7 +89,7 @@ static void nla_action_get_color(AnimData *adt, bAction *act, float color[4])
                        UI_GetThemeColor4fv(TH_ANIM_ACTIVE, color);
                }
                else {
-                       /* greyish-red color */
+                       /* grayish-red color */
                        UI_GetThemeColor4fv(TH_ANIM_INACTIVE, color);
                }
        }
@@ -217,7 +217,7 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
 {
        const float yheight = ymaxc - yminc;
        
-       /* drawing color is simply a light-grey */
+       /* drawing color is simply a light-gray */
        // TODO: is this color suitable?
        // XXX nasty hacked color for now... which looks quite bad too...
        glColor3f(0.7f, 0.7f, 0.7f);
@@ -480,7 +480,7 @@ static void nla_draw_strip_text(AnimData *adt, NlaTrack *nlt, NlaStrip *strip, i
 static void nla_draw_strip_frames_text(NlaTrack *UNUSED(nlt), NlaStrip *strip, View2D *v2d, float UNUSED(yminc), float ymaxc)
 {
        const float ytol = 1.0f; /* small offset to vertical positioning of text, for legibility */
-       const char col[4] = {220, 220, 220, 255}; /* light grey */
+       const char col[4] = {220, 220, 220, 255}; /* light gray */
        char numstr[32] = "";
        
        
@@ -551,7 +551,7 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
                                        /* draw each strip in the track (if visible) */
                                        for (strip = nlt->strips.first, index = 1; strip; strip = strip->next, index++) {
                                                if (BKE_nlastrip_within_bounds(strip, v2d->cur.xmin, v2d->cur.xmax)) {
-                                                       /* draw the visualisation of the strip */
+                                                       /* draw the visualization of the strip */
                                                        nla_draw_strip(snla, adt, nlt, strip, v2d, yminc, ymaxc);
                                                        
                                                        /* add the text for this strip to the cache */
index 2f5e32c61d10cc2b33ac5e4f4fb4b7342010c487..42fdd5173d417394de897952dc7934ca6c2dcb6a 100644 (file)
@@ -1541,7 +1541,7 @@ static void outliner_draw_tree(bContext *C, uiBlock *block, Scene *scene, ARegio
        starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
        outliner_draw_selection(ar, soops, &soops->tree, &starty);
        
-       // grey hierarchy lines
+       // gray hierarchy lines
        UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.4f);
        starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y / 2 - OL_Y_OFFSET;
        startx = 6;
index eb740e441b7c255516ad6888672f0e05a59f2e5a..449914feae40d14b29e6701ea7bfd6e7d3e02109 100644 (file)
@@ -1360,7 +1360,7 @@ void OUTLINER_OT_keyingset_add_selected(wmOperatorType *ot)
        /* identifiers */
        ot->idname = "OUTLINER_OT_keyingset_add_selected";
        ot->name = "Keying Set Add Selected";
-       ot->description = "Add selected items (blue-grey rows) to active Keying Set";
+       ot->description = "Add selected items (blue-gray rows) to active Keying Set";
        
        /* api callbacks */
        ot->exec = outliner_keyingset_additems_exec;
@@ -1397,7 +1397,7 @@ void OUTLINER_OT_keyingset_remove_selected(wmOperatorType *ot)
        /* identifiers */
        ot->idname = "OUTLINER_OT_keyingset_remove_selected";
        ot->name = "Keying Set Remove Selected";
-       ot->description = "Remove selected items (blue-grey rows) from active Keying Set";
+       ot->description = "Remove selected items (blue-gray rows) from active Keying Set";
        
        /* api callbacks */
        ot->exec = outliner_keyingset_removeitems_exec;
index 812fba50295bcd7e973710a01dbd046a4dcd1bd0..096713f9cd3e7576012d0129fbb16decacb58c47 100644 (file)
@@ -69,7 +69,7 @@
 #include "outliner_intern.h"
 
 /* ****************************************************** */
-/* Outliner Selection (grey-blue highlight for rows) */
+/* Outliner Selection (gray-blue highlight for rows) */
 
 static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *selecting)
 {
index 9148373cb2d42d553517511da097155d7f698ca8..38f29e8816ec6ab74869e6f8519a598751193d98 100644 (file)
@@ -1076,7 +1076,7 @@ static void draw_seq_backdrop(View2D *v2d)
 {
        int i;
        
-       /* darker grey overlay over the view backdrop */
+       /* darker gray overlay over the view backdrop */
        UI_ThemeColorShade(TH_BACK, -20);
        glRectf(v2d->cur.xmin,  -1.0,  v2d->cur.xmax,  1.0);
 
index e51f7a312eb7e0b43c463b0362c69dff70ad52f3..33aada7b8110fb1dd051db4d3c38f766ff6a00cf 100644 (file)
@@ -2269,7 +2269,7 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, const short dt)
        }
 }
 
-/* ****************************** Armature Visualisation ******************************** */
+/* ****************************** Armature Visualization ******************************** */
 
 /* ---------- Paths --------- */
 
index b3ccf004810f255e9e98e71378dfb2589b9bcbf3..1507dbfddda50f107263a1347324f4cf3cf9409c 100644 (file)
@@ -745,7 +745,7 @@ static char axisBlendAngle(float angle)
 }
 
 /* three colors can be set;
- * grey for ghosting
+ * gray for ghosting
  * moving: in transform theme color
  * else the red/green/blue
  */
index d52463cf406d43d001784b1dbbb7965927659480..17c57b1f6e47de162df2ff17b95e16c6121153a1 100644 (file)
@@ -133,7 +133,7 @@ static void draw_uvs_shadow(Object *obedit)
        BMIter iter, liter;
        MLoopUV *luv;
 
-       /* draws the grey mesh when painting */
+       /* draws the gray mesh when painting */
        glColor3ub(112, 112, 112);
 
        BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
index b15df9c3e89bc027d5e7a8f48af1e4e11ec34b3d..216ac61b628b4c90ebc857008ed78a9dc1e690e0 100644 (file)
@@ -3402,7 +3402,8 @@ static void UV_OT_cursor_set(wmOperatorType *ot)
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        /* properties */
-       RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in normalised (0.0-1.0) coordinates", -10.0f, 10.0f);
+       RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location",
+                            "Cursor location in normalized (0.0-1.0) coordinates", -10.0f, 10.0f);
 }
 
 /********************** set tile operator **********************/
index 93934b41f281479550f139bac1b615486d4e33af..a0d7bfbaaf68d2370ee06d070c5e62a5fd50fe73 100644 (file)
@@ -812,7 +812,7 @@ static bool joint_callback(const iTaSC::Timestamp& timestamp, iTaSC::ConstraintV
                        axis_angle_to_mat3(rmat, &chan->quat[1], chan->quat[0]);
                }
                else {
-                       /* quats are normalised before use to eliminate scaling issues */
+                       /* quats are normalized before use to eliminate scaling issues */
                        normalize_qt(chan->quat);
                        quat_to_mat3(rmat, chan->quat);
                }
index 8e996b9762248a6988bc4cacb57e3f404e23180e..182e0a7e29d4c9276d1776a695b11cd6b3ce63b2 100644 (file)
@@ -83,7 +83,7 @@ static ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size,
        
        logImageGetSize(image, &width, &height, &depth);
        
-       if (depth != 3) { /*need to do greyscale loading eventually.*/
+       if (depth != 3) { /*need to do grayscale loading eventually.*/
                logImageClose(image);
                return NULL;
        }
index 053d88c8c32c63c7be487d20d9541ebcd70bb5e3..3008c233718ff49fdb47a165ad3cd55cd7b1845e 100644 (file)
@@ -175,13 +175,13 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
        h = image->comps[0].h;
        
        switch (image->numcomps) {
-               case 1: /* Greyscale */
+               case 1: /* Grayscale */
                case 3: /* Color */
                        planes = 24;
                        use_alpha = FALSE;
                        break;
-               default: /* 2 or 4 - Greyscale or Color + alpha */
-                       planes = 32; /* greyscale + alpha */
+               default: /* 2 or 4 - Grayscale or Color + alpha */
+                       planes = 32; /* grayscale + alpha */
                        use_alpha = TRUE;
                        break;
        }
@@ -220,7 +220,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
                        r = image->comps[0].data;
                        a = (use_alpha) ? image->comps[1].data : NULL;
 
-                       /* greyscale 12bits+ */
+                       /* grayscale 12bits+ */
                        if (use_alpha) {
                                a = image->comps[1].data;
                                PIXEL_LOOPER_BEGIN(rect_float) {
@@ -272,7 +272,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
                        r = image->comps[0].data;
                        a = (use_alpha) ? image->comps[1].data : NULL;
 
-                       /* greyscale */
+                       /* grayscale */
                        if (use_alpha) {
                                a = image->comps[3].data;
                                PIXEL_LOOPER_BEGIN(rect_uchar) {
index 30dc61544b479b030fbe450cf3903d9c245842a9..615b420429aba73afac88cfe5d3d234046e4a990 100644 (file)
@@ -36,7 +36,7 @@
  * high-level routine that loads all images as 32-bit RGBA, handling all the
  * required conversions between many different TIFF types internally.
  * 
- * Saving supports RGB, RGBA and BW (greyscale) images correctly, with
+ * Saving supports RGB, RGBA and BW (grayscale) images correctly, with
  * 8 bits per channel in all cases.  The "deflate" compression algorithm is
  * used to compress images.
  */
@@ -765,7 +765,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags)
                             PHOTOMETRIC_RGB);
        }
        else if (samplesperpixel == 1) {
-               /* greyscale images, 1 channel */
+               /* grayscale images, 1 channel */
                TIFFSetField(image, TIFFTAG_PHOTOMETRIC,
                             PHOTOMETRIC_MINISBLACK);
        }
index ea012090bbd6a54f2cfea2e4a82741d9a6884f59..e78c3573f1020610ded11273b89b16a8cec65687 100644 (file)
@@ -43,7 +43,7 @@ struct Group;
 struct GHash;
 
 /* ************************************************ */
-/* Visualisation */
+/* Visualization */
 
 /* Motion Paths ------------------------------------ */
 /* (used for Pose Channels and Objects) */
@@ -83,10 +83,10 @@ typedef enum eMotionPath_Flag {
        MOTIONPATH_FLAG_EDIT        = (1 << 1)
 } eMotionPath_Flag;
 
-/* Visualisation General --------------------------- */
+/* Visualization General --------------------------- */
 /* for Objects or Poses (but NOT PoseChannels) */
 
-/* Animation Visualisation Settings (avs) */
+/* Animation Visualization Settings (avs) */
 typedef struct bAnimVizSettings {
        /* Onion-Skinning Settings ----------------- */
        int ghost_sf, ghost_ef;         /* start and end frames of ghost-drawing range (only used for GHOST_TYPE_RANGE) */
@@ -254,7 +254,7 @@ typedef enum ePchan_Flag {
        /* IK/Pose solving*/
        POSE_CHAIN      =   (1 << 9),
        POSE_DONE       =   (1 << 10),
-       /* visualisation */
+       /* visualization */
        POSE_KEY        =   (1 << 11),
        POSE_STRIDE     =   (1 << 12),
        /* standard IK solving */
index cc08d0e92bd265702e8ba5acba86e49deddcc0cf..0afe3773c944d4121f3e0111443a4723ff4b8e16 100644 (file)
@@ -127,9 +127,9 @@ typedef enum eArmature_Flag {
        ARM_AUTO_IK                     = (1<<9),
        ARM_NO_CUSTOM           = (1<<10),      /* made option negative, for backwards compat */
        ARM_COL_CUSTOM          = (1<<11),      /* draw custom colors  */
-       ARM_GHOST_ONLYSEL       = (1<<12),      /* when ghosting, only show selected bones (this should belong to ghostflag instead) */ // XXX depreceated
+       ARM_GHOST_ONLYSEL       = (1<<12),      /* when ghosting, only show selected bones (this should belong to ghostflag instead) */ /* XXX depreceated */
        ARM_DS_EXPAND           = (1<<13),      /* dopesheet channel is expanded */
-       ARM_HAS_VIZ_DEPS        = (1<<14),      /* other objects are used for visualising various states (hack for efficient updates) */
+       ARM_HAS_VIZ_DEPS        = (1<<14),      /* other objects are used for visualizing various states (hack for efficient updates) */
 } eArmature_Flag;
 
 /* armature->drawtype */
index 1b42d889c1daa05778c981c546714f8be2769217..3da6d0fc99d5a8cca8e16a03a8346e01a41dfa1a 100644 (file)
@@ -122,7 +122,7 @@ typedef struct Object {
        
        struct bGPdata *gpd;    /* Grease Pencil data */
        
-       bAnimVizSettings avs;   /* settings for visualisation of object-transform animation */
+       bAnimVizSettings avs;   /* settings for visualization of object-transform animation */
        bMotionPath *mpath;             /* motion path cache for this object */
        
        ListBase constraintChannels  DNA_DEPRECATED; // XXX depreceated... old animation system
index 5a49e45cf5e5026780cce874cca4639886e026b5..780ca0b5878ff2e7be8997c2465d67e08bb90db8 100644 (file)
@@ -112,7 +112,7 @@ typedef struct ReportList {
 #
 typedef struct ReportTimerInfo {
        float col[3];
-       float greyscale;
+       float grayscale;
        float widthfac;
 } ReportTimerInfo;
 
index 990d7c433096eb93fa7ff525c0640c129a209138..68075823a86ae08c6c695fc8a607bcc77734528f 100644 (file)
@@ -183,7 +183,7 @@ static void rna_def_animviz_ghosts(BlenderRNA *brna)
        srna = RNA_def_struct(brna, "AnimVizOnionSkinning", NULL);
        RNA_def_struct_sdna(srna, "bAnimVizSettings");
        RNA_def_struct_nested(brna, srna, "AnimViz");
-       RNA_def_struct_ui_text(srna, "Onion Skinning Settings", "Onion Skinning settings for animation visualisation");
+       RNA_def_struct_ui_text(srna, "Onion Skinning Settings", "Onion Skinning settings for animation visualization");
 
        /* Enums */
        prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
@@ -256,7 +256,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna)
        srna = RNA_def_struct(brna, "AnimVizMotionPaths", NULL);
        RNA_def_struct_sdna(srna, "bAnimVizSettings");
        RNA_def_struct_nested(brna, srna, "AnimViz");
-       RNA_def_struct_ui_text(srna, "Motion Path Settings", "Motion Path settings for animation visualisation");
+       RNA_def_struct_ui_text(srna, "Motion Path Settings", "Motion Path settings for animation visualization");
        
        /* Enums */
        prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
@@ -343,10 +343,10 @@ void rna_def_animviz_common(StructRNA *srna)
 {
        PropertyRNA *prop;
        
-       prop = RNA_def_property(srna, "animation_visualisation", PROP_POINTER, PROP_NONE);
+       prop = RNA_def_property(srna, "animation_visualization", PROP_POINTER, PROP_NONE);
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_pointer_sdna(prop, NULL, "avs");
-       RNA_def_property_ui_text(prop, "Animation Visualisation", "Animation data for this datablock");
+       RNA_def_property_ui_text(prop, "Animation Visualization", "Animation data for this datablock");
 }
 
 static void rna_def_animviz(BlenderRNA *brna)
@@ -356,21 +356,21 @@ static void rna_def_animviz(BlenderRNA *brna)
        
        srna = RNA_def_struct(brna, "AnimViz", NULL);
        RNA_def_struct_sdna(srna, "bAnimVizSettings");
-       RNA_def_struct_ui_text(srna, "Animation Visualisation", "Settings for the visualisation of motion");
+       RNA_def_struct_ui_text(srna, "Animation Visualization", "Settings for the visualization of motion");
        
        /* onion-skinning settings (nested struct) */
        prop = RNA_def_property(srna, "onion_skin_frames", PROP_POINTER, PROP_NONE);
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_struct_type(prop, "AnimVizOnionSkinning");
        RNA_def_property_pointer_funcs(prop, "rna_AnimViz_onion_skinning_get", NULL, NULL, NULL);
-       RNA_def_property_ui_text(prop, "Onion Skinning", "Onion Skinning (ghosting) settings for visualisation");
+       RNA_def_property_ui_text(prop, "Onion Skinning", "Onion Skinning (ghosting) settings for visualization");
        
        /* motion path settings (nested struct) */
        prop = RNA_def_property(srna, "motion_path", PROP_POINTER, PROP_NONE);
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_struct_type(prop, "AnimVizMotionPaths");
        RNA_def_property_pointer_funcs(prop, "rna_AnimViz_motion_paths_get", NULL, NULL, NULL);
-       RNA_def_property_ui_text(prop, "Motion Paths", "Motion Path settings for visualisation");
+       RNA_def_property_ui_text(prop, "Motion Paths", "Motion Path settings for visualization");
 }
 
 /* --- */
index e74d192b13fbc01233c3d52a3a259ea8b8ce42fe..8417f0b97e8c79ade703d22d68996ee206289f08 100644 (file)
@@ -1436,7 +1436,7 @@ static void rna_def_curve(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "use_fill_caps", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_FILL_CAPS);
-       RNA_def_property_ui_text(prop, "Fill Caps", "Fill caps for bevelled curves");
+       RNA_def_property_ui_text(prop, "Fill Caps", "Fill caps for beveled curves");
        RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
        /* texture space */
@@ -1640,7 +1640,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "hide", 1);
-       RNA_def_property_ui_text(prop, "Hide", "Hide this curve in editmode");
+       RNA_def_property_ui_text(prop, "Hide", "Hide this curve in Edit mode");
        RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
        prop = RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED);
index 144b8a7f90c34c17e0cca96b8e5876eb2d37426b..5eb15cf31b6591f64d168859b28279ba3dbb892e 100644 (file)
@@ -688,7 +688,7 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna)
                {2, "TAN", 0, "Tangent", ""},
                {3, "SQRT", 0, "Square Root", ""},
                {4, "LN", 0, "Natural Logarithm", ""},
-               {5, "SINC", 0, "Normalised Sine", "sin(x) / x"},
+               {5, "SINC", 0, "Normalized Sine", "sin(x) / x"},
                {0, NULL, 0, NULL, NULL}
        };
        
index 3cee8ca271c6a41c767cf0f361402fecf8d7aee9..4523858d6392acd939771e19d7119a7bcfcc9f4e 100644 (file)
@@ -776,7 +776,7 @@ static void rna_def_material_gamesettings(BlenderRNA *brna)
        };
 
        static EnumPropertyItem prop_face_orientation_items[] = {
-               {GEMAT_NORMAL, "NORMAL", 0, "Normal", "No tranformation"},
+               {GEMAT_NORMAL, "NORMAL", 0, "Normal", "No transformation"},
                {GEMAT_HALO, "HALO", 0, "Halo", "Screen aligned billboard"},
                {GEMAT_BILLBOARD, "BILLBOARD", 0, "Billboard", "Billboard with Z-axis constraint"},
                {GEMAT_SHADOW, "SHADOW", 0, "Shadow", "Faces are used for shadow"},
index 4c0d6eb30d2031dd24faa886ff79c293cbba7d95..ec09682d8b0ce55255f8b34ede7578e770566a19 100644 (file)
@@ -763,7 +763,7 @@ static EnumPropertyItem *rna_ImageFormatSettings_color_mode_itemf(bContext *C, P
        const char is_render = (id && GS(id->name) == ID_SCE);
 
        /* note, we need to act differently for render
-        * where 'BW' will force greyscale even if the output format writes
+        * where 'BW' will force grayscale even if the output format writes
         * as RGBA, this is age old blender convention and not sure how useful
         * it really is but keep it for now - campbell */
        char chan_flag = BKE_imtype_valid_channels(imf->imtype) | (is_render ? IMA_CHAN_FLAG_BW : 0);
@@ -2869,7 +2869,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna)
        RNA_def_property_enum_items(prop, image_color_mode_items);
        RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_ImageFormatSettings_color_mode_itemf");
        RNA_def_property_ui_text(prop, "Color Mode",
-                                "Choose BW for saving greyscale images, RGB for saving red, green and blue channels, "
+                                "Choose BW for saving grayscale images, RGB for saving red, green and blue channels, "
                                 "and RGBA for saving red, green, blue and alpha channels");
        RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
 
index 9b709e9ace13bd1cf566868a3ef3bbfb4b8b58ea..0270a7643a635cd041bd44bd8d291c732143f50b 100644 (file)
@@ -841,7 +841,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna)
        PropertyRNA *prop;
 
        static EnumPropertyItem prop_clouds_stype[] = {
-               {TEX_DEFAULT, "GREYSCALE", 0, "Greyscale", ""},
+               {TEX_DEFAULT, "GRAYSCALE", 0, "Grayscale", ""},
                {TEX_COLOR, "COLOR", 0, "Color", ""},
                {0, NULL, 0, NULL, NULL}
        };
@@ -1783,7 +1783,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
 
        static EnumPropertyItem file_format_items[] = {
                {TEX_VD_BLENDERVOXEL, "BLENDER_VOXEL", 0, "Blender Voxel", "Default binary voxel file format"},
-               {TEX_VD_RAW_8BIT, "RAW_8BIT", 0, "8 bit RAW", "8 bit greyscale binary data"},
+               {TEX_VD_RAW_8BIT, "RAW_8BIT", 0, "8 bit RAW", "8 bit grayscale binary data"},
                /*{TEX_VD_RAW_16BIT, "RAW_16BIT", 0, "16 bit RAW", ""}, */
                {TEX_VD_IMAGE_SEQUENCE, "IMAGE_SEQUENCE", 0, "Image Sequence",
                                        "Generate voxels from a sequence of image slices"},
index 7c9cb04b66a3b628ddef18a287c21340795d3dba..70d94bfc7ed88ad1e567fe2eddfdd977f9c0f286 100644 (file)
@@ -617,7 +617,7 @@ static void rna_def_ui_layout(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_funcs(prop, "rna_UILayout_enabled_get", "rna_UILayout_enabled_set");
-       RNA_def_property_ui_text(prop, "Enabled", "When false, this (sub)layout is greyed out");
+       RNA_def_property_ui_text(prop, "Enabled", "When false, this (sub)layout is grayed out");
        
        prop = RNA_def_property(srna, "alert", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_funcs(prop, "rna_UILayout_alert_get", "rna_UILayout_alert_set");
index c147e282632b64e33d6a0925ea69e14d934eb372..297dd8e4eb542549f9c9ef6c2127d1d59d9aef1b 100644 (file)
@@ -463,7 +463,7 @@ static void rna_def_userdef_theme_ui_font_style(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "shadowcolor", PROP_FLOAT, PROP_NONE);
        RNA_def_property_range(prop, 0.0f, 1.0f);
-       RNA_def_property_ui_text(prop, "Shadow Brightness", "Shadow color in grey value");
+       RNA_def_property_ui_text(prop, "Shadow Brightness", "Shadow color in gray value");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
index b5400244efe56edd8f1fb463a34571842430a153..8b393dd740aa5c1665362cdd476e6660895afb42 100644 (file)
@@ -319,7 +319,7 @@ void node_socket_copy_default_value(int type, void *to_default_value, void *from
  * In the interface this could be implemented by a pseudo-script textbox on linked inputs,
  * with quick selection from a predefined list of conversion options. Some Examples:
  * - vector component 'z' (vector->float):                                             "z"
- * - greyscale color (float->color):                                                   "grey"
+ * - grayscale color (float->color):                                                   "gray"
  * - color luminance (color->float):                                                   "lum"
  * - matrix column 2 length (matrix->vector->float):                   "col[1].len"
  * - mesh vertex coordinate 'y' (mesh->vertex->vector->float): "vertex.co.y"
index 6f572b43a157fa5952627007a690e2248b077927..8e8483839b1bd47208e00a7f8dca07bb5600a98f 100644 (file)
@@ -1041,7 +1041,7 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd)
                }
        }
 
-       /* color -> greyscale */
+       /* color -> grayscale */
        /* editing directly would alter the render view */
        if (rd->im_format.planes == R_IMF_PLANES_BW) {
                ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
index dd501e6d88057286a07f73aff927bd3d68eff448..28e50f1655e9bdd448119860c1150fc4cc87fabe 100644 (file)
@@ -368,7 +368,7 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win)
                if (win->eventstate == NULL)
                        win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state");
                
-               /* until screens get drawn, make it nice grey */
+               /* until screens get drawn, make it nice gray */
                glClearColor(0.55, 0.55, 0.55, 0.0);
                /* Crash on OSS ATI: bugs.launchpad.net/ubuntu/+source/mesa/+bug/656100 */
                if (!GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)) {
index f149b676aa5b91313c7505cfbd6f501a9e0708df..d87bb937b41bfe34220451befbf213136f463c18 100644 (file)
@@ -469,7 +469,7 @@ bool KX_Dome::ParseWarpMesh(STR_String text)
         * First line is the image type the mesh is support to be applied to: 2 = fisheye, 1=radial
         * Tthe next line has the mesh dimensions
         * Rest of the lines are the nodes of the mesh. Each line has x y u v i
-        *   (x,y) are the normalised screen coordinates
+        *   (x,y) are the normalized screen coordinates
         *   (u,v) texture coordinates
         *   i a multiplicative intensity factor
         *