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:
authorCampbell Barton <ideasman42@gmail.com>2020-06-05 07:34:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-05 07:34:00 +0300
commit9e96c6d05488370cd74c89b69b306da6f5e4de69 (patch)
treec443908c02f3eb6386aab015fce8d78a9bdc2798 /source/blender/draw/engines
parentb2d1c4873fd5ee6244490e47836dd24c83955574 (diff)
Cleanup: spelling
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c6
-rw-r--r--source/blender/draw/engines/eevee/eevee_private.h2
-rw-r--r--source/blender/draw/engines/eevee/eevee_renderpasses.c4
-rw-r--r--source/blender/draw/engines/eevee/eevee_shaders.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 0f10fb0ef53..cfc70baaf01 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -563,9 +563,9 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
const bool use_depth_shader = use_gpumat && ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED);
/* HACK: Assume the struct will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
void *key = (char *)ma + is_hair;
- /* Search for other material instances (sharing the same Material datablock). */
+ /* Search for other material instances (sharing the same Material data-block). */
EeveeMaterialCache **emc_p, *emc;
if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) {
return **emc_p;
@@ -641,7 +641,7 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
/* Search for the same shaders usage in the pass. */
/* HACK: Assume the struct will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
BLI_assert(option <= 16);
struct GPUShader *sh = GPU_material_get_shader(gpumat);
void *cache_key = (char *)sh + option;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index dbe2adef789..40008c5c364 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -180,7 +180,7 @@ enum {
/* Material shader cache keys */
enum {
/* HACK: This assumes the struct GPUShader will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing.
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing.
* We combine the GPUShader pointer with the key. */
KEY_CULL = (1 << 0),
KEY_REFRACT = (1 << 1),
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c
index 4a1880caf7d..9a47ca19e7b 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.c
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c
@@ -215,7 +215,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata,
}
}
-/* Postprocess data to construct a specific renderpass
+/* Post-process data to construct a specific render-pass
*
* This method will create a shading group to perform the post-processing for the given
* `renderpass_type`. The post-processing will be done and the result will be stored in the
@@ -223,7 +223,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata,
*
* Only invoke this function for passes that need post-processing.
*
- * After invoking this function the active framebuffer is set to `vedata->fbl->renderpass_fb`. */
+ * After invoking this function the active frame-buffer is set to `vedata->fbl->renderpass_fb`. */
void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata),
EEVEE_Data *vedata,
eViewLayerEEVEEPassType renderpass_type)
diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c
index 4d25f62a317..09e74c84948 100644
--- a/source/blender/draw/engines/eevee/eevee_shaders.c
+++ b/source/blender/draw/engines/eevee/eevee_shaders.c
@@ -738,7 +738,7 @@ struct GPUMaterial *EEVEE_material_get(
}
/* Meh, implicit option. World probe cannot be deferred because they need
- * to be rendered immediatly. */
+ * to be rendered immediately. */
const bool deferred = (options & VAR_WORLD_PROBE) == 0;
GPUMaterial *mat = eevee_material_get_ex(scene, ma, wo, options, deferred);