[Bf-blender-cvs] [8c3daab] master: Cleanup: style, spelling

[Campbell Barton]

Commit: 8c3daab298a3b8841b78c4149ed6c675c5b0d7f8
Author: Campbell Barton
Date:   Thu Sep 18 09:37:49 2014 +1000
Branches: master
https://developer.blender.org/rB8c3daab298a3b8841b78c4149ed6c675c5b0d7f8

Cleanup: style, spelling

===================================================================

M	CMakeLists.txt
M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/util/util_color.h
M	source/blender/editors/space_image/space_image.c
M	source/blender/editors/space_node/space_node.c

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f6d052..1dd9721 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 1f01622..1f61d80 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 48e9e2d..53b3d72 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 ffe9f13..ab616bf 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 875639d..ccaeae3 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;