code cleanup: misc warnings/style

7 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 7583b17eaf1..559a1cb7136 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2026,14 +2026,14 @@ static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out,
 	 * but reconstructing own_index in writefile.c would require parsing the identifier string.
 	 */
 
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406))
+#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) || defined(__clang__)
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 	sock->own_index = own_index;
 
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406))
+#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) || defined(__clang__)
 #  pragma GCC diagnostic pop
 #endif
 
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index ba897a87f97..4b058a41f71 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -660,6 +660,6 @@ list(APPEND INC
 	${CMAKE_CURRENT_BINARY_DIR}/operations
 )
 data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl
-		  ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC)
+          ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC)
 
 blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c
index 0903dd54208..c8256914884 100644
--- a/source/blender/editors/mesh/editmesh_knife_project.c
+++ b/source/blender/editors/mesh/editmesh_knife_project.c
@@ -139,7 +139,7 @@ static int knifeproject_exec(bContext *C, wmOperator *op)
 		/* select only tagged faces */
 		BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
 
-		/* note essential, but switch out of vertex mode since the
+		/* not essential, but switch out of vertex mode since the
 		 * selected regions wont be nicely isolated after flushing.
 		 * note: call after de-select to avoid selection flushing */
 		EDBM_selectmode_disable(scene, em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE);
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 947ee240e0d..2fdefacc141 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -3029,7 +3029,7 @@ static int edbm_select_ungrouped_exec(bContext *C, wmOperator *op)
 	BMVert *eve;
 	BMIter iter;
 
-	if (!em->selectmode == SCE_SELECT_VERTEX) {
+	if ((em->selectmode & SCE_SELECT_VERTEX) == 0) {
 		BKE_report(op->reports, RPT_ERROR, "Does not work out of vertex selection mode");
 		return OPERATOR_CANCELLED;
 	}
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 4d3876068b6..9f2e0b71b0b 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -114,18 +114,18 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodecla
 				continue;
 			
 			switch (ntree->type) {
-			case NTREE_COMPOSIT:
-				ngroup_type = "CompositorNodeTree";
-				node_type = "CompositorNodeGroup";
-				break;
-			case NTREE_SHADER:
-				ngroup_type = "ShaderNodeTree";
-				node_type = "ShaderNodeGroup";
-				break;
-			case NTREE_TEXTURE:
-				ngroup_type = "TextureNodeTree";
-				node_type = "TextureNodeGroup";
-				break;
+				case NTREE_COMPOSIT:
+					ngroup_type = "CompositorNodeTree";
+					node_type = "CompositorNodeGroup";
+					break;
+				case NTREE_SHADER:
+					ngroup_type = "ShaderNodeTree";
+					node_type = "ShaderNodeGroup";
+					break;
+				case NTREE_TEXTURE:
+					ngroup_type = "TextureNodeTree";
+					node_type = "TextureNodeGroup";
+					break;
 			}
 			
 			ptr = uiItemFullO(layout, "NODE_OT_group_make", "New Group", ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 106a2e0f511..8307a6a5bcf 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -163,7 +163,7 @@ if(WITH_INTERNATIONAL)
 endif()
 
 if(APPLE)
-    # SSE math is enabled by default on x86_64
+	# SSE math is enabled by default on x86_64
 	if(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
 		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e4d37942e17..60d262d402f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -472,7 +472,7 @@ elseif(WIN32)
 	if(WITH_PYTHON)
 		set_lib_path(PYLIB "python")
 
-		STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+		string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
 		install(
 			FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll