diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 17:42:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 17:42:14 +0400 |
| commit | 263be14811c65ee67646308b116c6afd8f817384 (patch) | |
| tree | 865b7542c21bcdd6030d8209d9a264447dc2c338 /source | |
| parent | 79fb3311a3397ddf6b1a3e0e10b4dc0f4fee4d70 (diff) | |
rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/math_color_inline.c | 1 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index f270a20003d..23d70bd148b 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -239,6 +239,7 @@ MINLINE unsigned char rgb_to_grayscale_byte(const unsigned char rgb[3]) return (76 * (unsigned short) rgb[0] + 148 * (unsigned short) rgb[1] + 31 * (unsigned short) rgb[2]) / 255; } +/* luma from defined by 'YCC_JFIF', see #rgb_to_ycc */ MINLINE float rgb_to_luma(const float rgb[3]) { return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2]; diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 99db5576fa0..720d68ef00d 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -153,7 +153,7 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() - if(WITH_BUILTIN_GLEW) + if(NOT WITH_SYSTEM_GLEW) list(APPEND BLENDER_SORTED_LIBS extern_glew) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e8b951f3680..033b1352e51 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -908,7 +908,7 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() - if(WITH_BUILTIN_GLEW) + if(NOT WITH_SYSTEM_GLEW) list(APPEND BLENDER_SORTED_LIBS extern_glew) endif() |