code cleanup: typo and warning when openmp's disabled.

5 files changed, 8 insertions, 7 deletions

diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index 4c90a37e720..29eebe86afa 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -484,7 +484,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 	
 	/* the number of joints determines how we fill:
 	 *  1) between joint and cursor (joint=head, cursor=tail)
-	 *  2) between the two joints (order is dependent on active-bone/hierachy)
+	 *  2) between the two joints (order is dependent on active-bone/hierarchy)
 	 *  3+) error (a smarter method involving finding chains needs to be worked out
 	 */
 	count = BLI_countlist(&points);
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index e7489e1bc72..bb4640949c1 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -106,7 +106,7 @@ typedef struct EditBone {
 	(((ebone)->flag & BONE_SELECTED) && !((ebone)->flag & BONE_EDITMODE_LOCKED)) \
 	)
 
-/* used in bone_select_hierachy() */
+/* used in armature_select_hierarchy_exec() */
 #define BONE_SELECT_PARENT  0
 #define BONE_SELECT_CHILD   1
 
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index 87e267b1072..980223e24c0 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -277,8 +277,9 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 		Object *ob;
 		ViewContext vc;
 		LassoMaskData data;
+#ifdef _OPENMP
 		Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-
+#endif
 		struct MultiresModifierData *mmd;
 		DerivedMesh *dm;
 		PBVH *pbvh;
@@ -322,7 +323,7 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
 
 		sculpt_undo_push_begin("Mask lasso fill");
 
-		#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
+#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
 		for (i = 0; i < totnode; i++) {
 			PBVHVertexIter vi;
 
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index fda8c19d21b..5168c3c873a 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1624,7 +1624,7 @@ void draw_outliner(const bContext *C)
 	/* set matrix for 2d-view controls */
 	UI_view2d_view_ortho(v2d);
 
-	/* draw outliner stuff (background, hierachy lines and names) */
+	/* draw outliner stuff (background, hierarchy lines and names) */
 	outliner_back(ar);
 	block = uiBeginBlock(C, ar, __func__, UI_EMBOSS);
 	outliner_draw_tree((bContext *)C, block, scene, ar, soops, &te_edit);
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index c3d7d3179b6..5a956ffc048 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -630,7 +630,7 @@ void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 				newsensorobj = (SCA_IObject*)(*h_obj);
 			if (!newsensorobj)
 			{
-				// no, then the sensor points outside the hierachy, keep it the same
+				// no, then the sensor points outside the hierarchy, keep it the same
 				if (m_objectlist->SearchValue(oldsensorobj))
 					// only replicate links that points to active objects
 					m_logicmgr->RegisterToSensor(cont,oldsensor);
@@ -670,7 +670,7 @@ void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 
 			if (!newactuatorobj)
 			{
-				// no, then the sensor points outside the hierachy, keep it the same
+				// no, then the sensor points outside the hierarchy, keep it the same
 				if (m_objectlist->SearchValue(oldactuatorobj))
 					// only replicate links that points to active objects
 					m_logicmgr->RegisterToActuator(cont,oldactuator);