Merge branch 'master' into blender2.8

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c
index 89cffd6c19c..9695643d707 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -26,7 +26,7 @@
 /**
  * DRW Instance Data Manager
  * This is a special memory manager that keeps memory blocks ready to send as vbo data in one continuous allocation.
- * This way we avoid feeding gawain each instance data one by one and unecessary memcpy.
+ * This way we avoid feeding gawain each instance data one by one and unnecessary memcpy.
  * Since we loose which memory block was used each DRWShadingGroup we need to redistribute them in the same order/size
  * to avoid to realloc each frame.
  * This is why DRWInstanceDatas are sorted in a list for each different data size.
@@ -406,7 +406,7 @@ void DRW_instance_data_list_free_unused(DRWInstanceDataList *idatalist)
 					idatalist->idata_head[i] = next_idata;
 				}
 				else {
-					/* idatalist->idata_tail[i] is garanteed not to be null in this case. */
+					/* idatalist->idata_tail[i] is guaranteed not to be null in this case. */
 					idatalist->idata_tail[i]->next = next_idata;
 				}
 				DRW_instance_data_free(idata);