Merge branch 'blender2.8' into transform-manipulatorstransform-manipulators

Conflicts:
	intern/gawain/gawain/immediate.h
	intern/gawain/src/immediate.c
	source/blender/editors/physics/physics_ops.c
	source/blender/editors/screen/glutil.c
	source/blender/editors/space_view3d/space_view3d.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_ops.c
	source/blender/editors/transform/transform_manipulator.c

1 files changed, 2 insertions, 2 deletions

diff --git a/source/gameengine/VideoTexture/FilterColor.h b/source/gameengine/VideoTexture/FilterColor.h
index 350f7270874..d042863d7e8 100644
--- a/source/gameengine/VideoTexture/FilterColor.h
+++ b/source/gameengine/VideoTexture/FilterColor.h
@@ -36,7 +36,7 @@
 #include "FilterBase.h"
 
 
-/// pixel filter for gray scale
+/// pixel filter for grayscale
 class FilterGray : public FilterBase
 {
 public:
@@ -53,7 +53,7 @@ protected:
 		// calculate gray value
 		unsigned int gray = (28 * (VT_B(val)) + 151 * (VT_G(val))
 			+ 77 * (VT_R(val))) >> 8;
-		// return gray scale value
+		// return grayscale value
 		VT_R(val) = gray;
 		VT_G(val) = gray;
 		VT_B(val) = gray;