diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-18 03:37:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-18 03:37:49 +0400 |
| commit | 8c3daab298a3b8841b78c4149ed6c675c5b0d7f8 (patch) | |
| tree | 8d91672cb1f37086db369fad86a8d669cc5b8523 | |
| parent | 62893dc398560ec5c36526ac9b617399ef12413e (diff) | |
Cleanup: style, spelling
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_color.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f6d052d766..1dd972196fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,8 @@ if(APPLE) execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version if(${MAC_SYS} MATCHES 14) set(OSX_SYSTEM 10.10) - cmake_minimum_required(VERSION 3.0.0) # throw an error here, older cmake cannot handle 2 digit subversion ! + # throw an error here, older cmake cannot handle 2 digit subversion! + cmake_minimum_required(VERSION 3.0.0) elseif(${MAC_SYS} MATCHES 13) set(OSX_SYSTEM 10.9) elseif(${MAC_SYS} MATCHES 12) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 1f01622e349..1f61d80b947 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -530,7 +530,7 @@ typedef enum AttributeStandard { /* TODO(sergey): This is rather nasty bug happening in here, which * could be simply a compilers bug for which we can't find a generic - * platform indipendent workaround. Also even if it's a compiler + * platform independent workaround. Also even if it's a compiler * issue, it's not so simple to upgrade the compiler in the release * environment for linux and doing it so closer to the release is * rather a risky business. diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index 48e9e2d025f..53b3d72de67 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -170,7 +170,7 @@ ccl_device float3 color_srgb_to_scene_linear(float3 c) #ifdef __KERNEL_SSE2__ /* * Calculate initial guess for arg^exp based on float representation - * This method gives a constant bias, which can be easily compensated by multiplicating with bias_coeff. + * This method gives a constant bias, which can be easily compensated by multiplication with bias_coeff. * Gives better results for exponents near 1 (e. g. 4/5). * exp = exponent, encoded as uint32_t * e2coeff = 2^(127/exponent - 127) * bias_coeff^(1/exponent), encoded as uint32_t diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index ffe9f13af3f..ab616bf592f 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -540,7 +540,7 @@ static void image_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn) break; } case NC_WM: - if(wmn->data == ND_UNDO) { + if (wmn->data == ND_UNDO) { ED_area_tag_redraw(sa); ED_area_tag_refresh(sa); } diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 875639da113..ccaeae34927 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -511,7 +511,7 @@ static void node_area_listener(bScreen *sc, ScrArea *sa, wmNotifier *wmn) } break; case NC_WM: - if(wmn->data == ND_UNDO) { + if (wmn->data == ND_UNDO) { ED_area_tag_refresh(sa); } break; |