Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-19 19:19:49 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-19 19:20:50 +0300
commit6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch)
tree17d66beede9df8d8b43f9db39265649c2d72e732 /source/blender/draw/intern/draw_cache_impl_particles.c
parenta7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff)
parenta4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_particles.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_particles.c10
1 files changed, 5 insertions, 5 deletions
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);