Merge branch 'master' into blender2.8

3 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index edab76cd7e1..e7316604166 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -676,7 +676,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
 				if (was_output == 0)
 					ED_node_tag_update_nodetree(bmain, ntree, node);
 
-				/* addnode() doesnt link this yet... */
+				/* addnode() doesn't link this yet... */
 				node->id = (ID *)BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
 			}
 			else if (node->type == CMP_NODE_COMPOSITE) {
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index c4cd59b65f4..8f3d3d8a4b3 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -1161,7 +1161,7 @@ static void node_join_attach_recursive(bNode *node, bNode *frame)
 		if (node->parent->done & NODE_JOIN_IS_DESCENDANT)
 			node->done |= NODE_JOIN_IS_DESCENDANT;
 		else if (node->flag & NODE_TEST) {
-			/* if parent is not an decendant of the frame, reattach the node */
+			/* if parent is not an descendant of the frame, reattach the node */
 			nodeDetachNode(node);
 			nodeAttachNode(node, frame);
 			node->done |= NODE_JOIN_IS_DESCENDANT;
@@ -1327,7 +1327,7 @@ static void node_detach_recursive(bNode *node)
 		if (node->parent->done & NODE_DETACH_IS_DESCENDANT)
 			node->done |= NODE_DETACH_IS_DESCENDANT;
 		else if (node->flag & NODE_SELECT) {
-			/* if parent is not a decendant of a selected node, detach */
+			/* if parent is not a descendant of a selected node, detach */
 			nodeDetachNode(node);
 			node->done |= NODE_DETACH_IS_DESCENDANT;
 		}
@@ -1590,7 +1590,7 @@ static void node_link_insert_offset_frame_chains(
 
 /**
  * Callback that applies NodeInsertOfsData.offset_x to a node or its parent,
- * considering the logic needed for offseting nodes after link insert
+ * considering the logic needed for offsetting nodes after link insert
  */
 static bool node_link_insert_offset_chain_cb(
         bNode *fromnode, bNode *tonode,
@@ -1648,7 +1648,7 @@ static void node_link_insert_offset_ntree(
 	/* insert->totr isn't updated yet, so totr_insert is used to get the correct worldspace coords */
 	node_to_updated_rect(insert, &totr_insert);
 
-	/* frame attachement was't handled yet so we search the frame that the node will be attached to later */
+	/* frame attachment wasn't handled yet so we search the frame that the node will be attached to later */
 	insert->parent = node_find_frame_to_attach(ar, ntree, mouse_xy);
 
 	/* this makes sure nodes are also correctly offset when inserting a node on top of a frame
diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c
index 00eab0c69c1..22df2586a7b 100644
--- a/source/blender/editors/space_node/node_view.c
+++ b/source/blender/editors/space_node/node_view.c
@@ -193,7 +193,7 @@ void NODE_OT_view_selected(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-/* **************** Backround Image Operators ************** */
+/* **************** Background Image Operators ************** */
 
 typedef struct NodeViewMove {
 	int mvalo[2];