diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
| commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
| tree | 14629685150a04440e2629fd45bd90891b8767ed /source/gameengine | |
| parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
| parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/FilterColor.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/FilterColor.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index eed84a8580c..15a7e9e4cd1 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -68,7 +68,7 @@ PyTypeObject FilterGrayType = 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "Filter for gray scale effect", /* tp_doc */ + "Filter for grayscale effect", /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 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; |