Merge branch 'master' into blender2.8

10 files changed, 26 insertions, 26 deletions

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index a84b3fdeb41..52b076151d8 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -286,7 +286,7 @@ static void drw_shgroup_bone_envelope(
 		float fac_head = (len - head_sphere[3]) / len;
 		float fac_tail = (len - tail_sphere[3]) / len;
 
-		/* Small epsilon to avoid problem with float precison in shader. */
+		/* Small epsilon to avoid problem with float precision in shader. */
 		if (len > (tail_sphere[3] + head_sphere[3]) + 1e-8f) {
 
 			copy_v4_v4(tmp_sphere, head_sphere);
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 4bd9accec4b..3314030cd5e 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -379,7 +379,7 @@ static void mesh_render_calc_normals_loop_and_poly(const Mesh *me, const float s
 /**
  * TODO(campbell): 'gpumat_array' may include materials linked to the object.
  * While not default, object materials should be supported.
- * Although this only impacts the data thats generated, not the materials that display.
+ * Although this only impacts the data that's generated, not the materials that display.
  */
 static MeshRenderData *mesh_render_data_create_ex(
         Mesh *me, const int types,
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index b0da9d7082d..263aaa1ffdf 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -759,11 +759,11 @@ static void particle_batch_cache_ensure_procedural_final_points(
 
 	cache->final[subdiv].proc_buf = GPU_vertbuf_create_with_format(&format);
 
-	/* Create a destination buffer for the tranform feedback. Sized appropriately */
-	/* Thoses are points! not line segments. */
+	/* Create a destination buffer for the transform feedback. Sized appropriately */
+	/* Those are points! not line segments. */
 	GPU_vertbuf_data_alloc(cache->final[subdiv].proc_buf, cache->final[subdiv].strands_res * cache->strands_len);
 
-	/* Create vbo immediatly to bind to texture buffer. */
+	/* Create vbo immediately to bind to texture buffer. */
 	GPU_vertbuf_use(cache->final[subdiv].proc_buf);
 
 	cache->final[subdiv].proc_tex = GPU_texture_create_from_vertbuf(cache->final[subdiv].proc_buf);
@@ -913,7 +913,7 @@ static void particle_batch_cache_ensure_procedural_strand_data(
 		MEM_freeN(parent_mcol);
 	}
 
-	/* Create vbo immediatly to bind to texture buffer. */
+	/* Create vbo immediately to bind to texture buffer. */
 	GPU_vertbuf_use(cache->proc_strand_buf);
 	cache->strand_tex = GPU_texture_create_from_vertbuf(cache->proc_strand_buf);
 
@@ -1026,7 +1026,7 @@ static void particle_batch_cache_ensure_procedural_pos(
 		}
 	}
 
-	/* Create vbo immediatly to bind to texture buffer. */
+	/* Create vbo immediately to bind to texture buffer. */
 	GPU_vertbuf_use(cache->proc_point_buf);
 
 	cache->point_tex = GPU_texture_create_from_vertbuf(cache->proc_point_buf);
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 814e90b1db0..ceeefdd38a5 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -105,7 +105,7 @@ typedef struct GlobalsUboStorage {
 
 	/* NOTE! Put all color before UBO_LAST_COLOR */
 
-	/* Pack individual float at the end of the buffer to avoid alignement errors */
+	/* Pack individual float at the end of the buffer to avoid alignment errors */
 	float sizeLampCenter, sizeLampCircle, sizeLampCircleShadow;
 	float sizeVertex, sizeEdge, sizeEdgeFix, sizeFaceDot;
 	float gridDistance, gridResolution, gridSubdivisions, gridScale;
diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c
index 6ede573199f..ebdb4c72d09 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -57,7 +57,7 @@ typedef enum ParticleRefineShader {
 } ParticleRefineShader;
 
 static GPUShader *g_refine_shaders[PART_REFINE_MAX_SHADER] = {NULL};
-static DRWPass *g_tf_pass; /* XXX can be a problem with mulitple DRWManager in the future */
+static DRWPass *g_tf_pass; /* XXX can be a problem with multiple DRWManager in the future */
 
 extern char datatoc_common_hair_lib_glsl[];
 extern char datatoc_common_hair_refine_vert_glsl[];
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);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 221702b0912..f1d92736f54 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -965,7 +965,7 @@ static void drw_engines_cache_populate(Object *ob)
 	DST.ob_state = NULL;
 
 	/* HACK: DrawData is copied by COW from the duplicated object.
-	 * This is valid for IDs that cannot be instanciated but this
+	 * This is valid for IDs that cannot be instantiated but this
 	 * is not what we want in this case so we clear the pointer
 	 * ourselves here. */
 	drw_drawdata_unlink_dupli((ID *)ob);
@@ -1092,7 +1092,7 @@ int DRW_draw_region_engine_info_offset(void)
 void DRW_draw_region_engine_info(void)
 {
 	const char *info_array_final[MAX_INFO_LINES + 1];
-	/* This should be maxium number of engines running at the same time. */
+	/* This should be maximum number of engines running at the same time. */
 	char info_array[MAX_INFO_LINES][GPU_INFO_SIZE];
 	int i = 0;
 
@@ -1579,7 +1579,7 @@ void DRW_draw_render_loop_ex(
 
 	if (G.debug_value > 20 && G.debug_value < 30) {
 		glDisable(GL_DEPTH_TEST);
-		rcti rect; /* local coordinate visible rect inside region, to accomodate overlapping ui */
+		rcti rect; /* local coordinate visible rect inside region, to accommodate overlapping ui */
 		ED_region_visible_rect(DST.draw_ctx.ar, &rect);
 		DRW_stats_draw(&rect);
 		glEnable(GL_DEPTH_TEST);
@@ -1899,7 +1899,7 @@ void DRW_render_object_iter(
 	DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END
 }
 
-/* Assume a valid gl context is bound (and that the gl_context_mutex has been aquired).
+/* Assume a valid gl context is bound (and that the gl_context_mutex has been acquired).
  * This function only setup DST and execute the given function.
  * Warning: similar to DRW_render_to_image you cannot use default lists (dfbl & dtxl). */
 void DRW_custom_pipeline(
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 902ecb9ee9b..5916b45aa27 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -120,8 +120,8 @@ typedef struct DRWCallState {
 	float modelviewinverse[4][4];
 	float modelviewprojection[4][4];
 	float normalview[3][3];
-	float normalworld[3][3]; /* Not view dependant */
-	float orcotexfac[2][3]; /* Not view dependant */
+	float normalworld[3][3]; /* Not view dependent */
+	float orcotexfac[2][3]; /* Not view dependent */
 	float eyevec[3];
 } DRWCallState;
 
@@ -355,9 +355,9 @@ typedef struct DRWManager {
 
 	bool buffer_finish_called; /* Avoid bad usage of DRW_render_instance_buffer_finish */
 
-	/* View dependant uniforms. */
+	/* View dependent uniforms. */
 	DRWMatrixState original_mat; /* Original rv3d matrices. */
-	int override_mat;            /* Bitflag of which matrices are overriden. */
+	int override_mat;            /* Bitflag of which matrices are overridden. */
 	int num_clip_planes;         /* Number of active clipplanes. */
 	bool dirty_mat;
 
@@ -381,7 +381,7 @@ typedef struct DRWManager {
 	 * the top portion of the struct so DO NOT MOVE IT! */
 	void *gl_context;                /* Unique ghost context used by the draw manager. */
 	GPUContext *gpu_context;
-	TicketMutex *gl_context_mutex;    /* Mutex to lock the drw manager and avoid concurent context usage. */
+	TicketMutex *gl_context_mutex;    /* Mutex to lock the drw manager and avoid concurrent context usage. */
 
 	/** GPU Resource State: Memory storage between drawing. */
 	struct {
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index d0cac271674..248a17d0c68 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -145,7 +145,7 @@ void DRW_shgroup_uniform_texture(DRWShadingGroup *shgroup, const char *name, con
 	drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_TEXTURE, tex, 0, 1);
 }
 
-/* Same as DRW_shgroup_uniform_texture but is garanteed to be bound if shader does not change between shgrp. */
+/* Same as DRW_shgroup_uniform_texture but is guaranteed to be bound if shader does not change between shgrp. */
 void DRW_shgroup_uniform_texture_persistent(DRWShadingGroup *shgroup, const char *name, const GPUTexture *tex)
 {
 	BLI_assert(tex != NULL);
@@ -158,7 +158,7 @@ void DRW_shgroup_uniform_block(DRWShadingGroup *shgroup, const char *name, const
 	drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_BLOCK, ubo, 0, 1);
 }
 
-/* Same as DRW_shgroup_uniform_block but is garanteed to be bound if shader does not change between shgrp. */
+/* Same as DRW_shgroup_uniform_block but is guaranteed to be bound if shader does not change between shgrp. */
 void DRW_shgroup_uniform_block_persistent(DRWShadingGroup *shgroup, const char *name, const GPUUniformBuffer *ubo)
 {
 	BLI_assert(ubo != NULL);
@@ -960,7 +960,7 @@ void DRW_shgroup_instance_batch(DRWShadingGroup *shgroup, struct GPUBatch *batch
 	drw_call_calc_orco(NULL, shgroup->instance_orcofac);
 	/* PERF : This destroys the vaos cache so better check if it's necessary. */
 	/* Note: This WILL break if batch->verts[0] is destroyed and reallocated
-	 * at the same adress. Bindings/VAOs would remain obsolete. */
+	 * at the same address. Bindings/VAOs would remain obsolete. */
 	//if (shgroup->instancing_geom->inst != batch->verts[0])
 	GPU_batch_instbuf_set(shgroup->instance_geom, batch->verts[0], false);
 
@@ -1123,7 +1123,7 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b)
 
 /**
  * Sort Shading groups by decreasing Z of their first draw call.
- * This is usefull for order dependant effect such as transparency.
+ * This is useful for order dependent effect such as transparency.
  **/
 void DRW_pass_sort_shgroup_z(DRWPass *pass)
 {
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 3180cf5c459..938dda2eec9 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -788,7 +788,7 @@ static void draw_matrices_model_prepare(DRWCallState *st)
 		/* set eye vector, transformed to object coords */
 		mul_m3_v3(tmp, st->eyevec);
 	}
-	/* Non view dependant */
+	/* Non view dependent */
 	if (st->matflag & DRW_CALL_MODELINVERSE) {
 		invert_m4_m4(st->modelinverse, st->model);
 		st->matflag &= ~DRW_CALL_MODELINVERSE;
@@ -908,7 +908,7 @@ static void bind_ubo(GPUUniformBuffer *ubo, char bind_type)
 		/* printf so user can report bad behaviour */
 		printf("Not enough ubo slots! This should not happen!\n");
 		/* This is not depending on user input.
-		 * It is our responsability to make sure there is enough slots. */
+		 * It is our responsibility to make sure there is enough slots. */
 		BLI_assert(0);
 	}
 	slot_flags[bind_num] = bind_type;