diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-09-19 06:18:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-19 06:19:53 +0300 |
commit | d8a7e5ee324ef4648a317ef232aae5b5a8ed991f (patch) | |
tree | 8e9a231e2fd37a811df904df4437eed863121582 /source/blender/draw | |
parent | 741d7d60ed90707f3f20b86372669ca5287a74da (diff) |
Cleanup: spelling
Diffstat (limited to 'source/blender/draw')
6 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c index 257ec6bc8f0..46fc6e07c1c 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows.c +++ b/source/blender/draw/engines/eevee/eevee_shadows.c @@ -163,7 +163,7 @@ void EEVEE_shadows_caster_material_add(EEVEE_ViewLayerData *sldata, return; } - /* Grrr needed for correctness but not 99% of the time not needed. + /* Unfortunately needed for correctness but not 99% of the time not needed. * TODO detect when needed? */ DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo); DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo); diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 30ad8482f76..8376b8c67b8 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -356,7 +356,7 @@ void EEVEE_subsurface_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } if (!DRW_pass_is_empty(psl->sss_translucency_ps)) { - /* We sample the shadowmaps using normal sampler. We need to disable Comparison mode. + /* We sample the shadow-maps using normal sampler. We need to disable Comparison mode. * TODO(fclem) avoid this by using sampler objects.*/ GPU_texture_bind(sldata->shadow_cube_pool, 0); GPU_texture_compare_mode(sldata->shadow_cube_pool, false); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index cfebe48a836..711c956ce4b 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -632,7 +632,7 @@ void EEVEE_volumes_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) int tex_transmit = GPU_texture_opengl_bindcode(txl->volume_transmit_history); /* TODO(fclem) Encapsulate these GL calls into DRWManager. */ glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); - /* Subtility here! we need to tell the GL that the texture is layered (GL_TRUE) + /* Subtlety here! we need to tell the GL that the texture is layered (GL_TRUE) * in order to bind the full 3D texture and not just a 2D slice. */ glBindImageTexture(0, tex_scatter, 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R11F_G11F_B10F); glBindImageTexture(1, tex_transmit, 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R11F_G11F_B10F); diff --git a/source/blender/draw/engines/select/select_draw_utils.c b/source/blender/draw/engines/select/select_draw_utils.c index cac8b5cb304..0203b6cbebf 100644 --- a/source/blender/draw/engines/select/select_draw_utils.c +++ b/source/blender/draw/engines/select/select_draw_utils.c @@ -63,10 +63,10 @@ short select_id_get_object_select_mode(Scene *scene, Object *ob) { short r_select_mode = 0; if (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) { - /* In order to sample flat colors for vertex weights / texturepaint / vertexpaint + /* In order to sample flat colors for vertex weights / texture-paint / vertex-paint * we need to be in SCE_SELECT_FACE mode so select_cache_init() correctly sets up * a shgroup with select_id_flat. - * Note this is not working correctly for vertexpaint (yet), but has been discussed + * Note this is not working correctly for vertex-paint (yet), but has been discussed * in T66645 and there is a solution by @mano-wii in P1032. * So OB_MODE_VERTEX_PAINT is already included here [required for P1032 I guess]. */ Mesh *me_orig = DEG_get_original_object(ob)->data; diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index b55a84b2765..709116c78e5 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -120,8 +120,8 @@ typedef struct DRWCullingState { * 9 bits for resource id inside the chunk. (can go up to 511) * |-|----------------------|---------| * - * Use manual bitsift and mask instead of bitfields to avoid - * compiler dependant behavior that would mess the ordering of + * Use manual bit-shift and mask instead of bit-fields to avoid + * compiler dependent behavior that would mess the ordering of * the members thus changing the sorting order. */ typedef uint32_t DRWResourceHandle; diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index cdf2c208351..2e41cb58016 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -55,9 +55,9 @@ static void draw_call_sort(DRWCommand *array, DRWCommand *array_tmp, int array_len) { /* Count unique batches. Tt's not really important if - * there is colisions. If there is a lot of different batches, - * the sorting benefit will be negligeable. So at least - * sort fast! */ + * there is collisions. If there is a lot of different batches, + * the sorting benefit will be negligible. + * So at least sort fast! */ uchar idx[128] = {0}; /* Shift by 6 positions knowing each GPUBatch is > 64 bytes */ #define KEY(a) ((((size_t)((a).draw.batch)) >> 6) % ARRAY_SIZE(idx)) |