diff --git a/build_files/config/README.md b/build_files/config/README.md index efa3d4524ec..f56d852f523 100644 --- a/build_files/config/README.md +++ b/build_files/config/README.md @@ -1,10 +1,10 @@ Pipeline Config =============== -The `yaml` configuration file is used by buildbot build pipeline `update-code` step. +The `yaml` configuration file is used by buildbot build pipeline `update-code` step. The file allows to set branches or specific commits for both git submodules and svn artifacts. Can also define various build package versions for use by build workers. Especially useful in experimental and release branches. NOTE: -* The configuration file is ```NOT``` used by the `../utils/make_update.py` script. +* The configuration file is ```NOT``` used by the `../utils/make_update.py` script. * That will implemented in the future. diff --git a/doc/python_api/examples/bpy.app.translations.py b/doc/python_api/examples/bpy.app.translations.py index 36ce34264b5..b8d94f41528 100644 --- a/doc/python_api/examples/bpy.app.translations.py +++ b/doc/python_api/examples/bpy.app.translations.py @@ -57,7 +57,7 @@ translations_tuple = ( (("Operator", "Render: Copy Settings"), (("bpy.types.SCENE_OT_render_copy_settings",), ()), - ("fr_FR", "Rendu : copier réglages", + ("fr_FR", "Rendu: copier réglages", (False, ())), ), (("*", "Copy render settings from current scene to others"), diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh index d9642e13ddb..be8d5159feb 100644 --- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh +++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh @@ -176,7 +176,7 @@ template class Preprocessor { * * }; // End of Wrapper // Added at runtime by backend. * - * kernel entry_point() { // Added at runtime by backend. + * kernel entry_point() { // Added at runtime by backend. * * threadgroup float foo; // MSL_SHARED_VARS_DECLARE * threadgroup float bar[10] // MSL_SHARED_VARS_DECLARE