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-11-16 08:48:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-16 08:48:41 +0300
commita3a6d6a670f1074de3a83fef2f58c72bd66b270d (patch)
tree105e77b3dceb578ef8f2aa8cfa65cceff1258c8d /source/blender/render
parent4eac03d821fa17546f562485f7d073813a5e5943 (diff)
Cleanup: spelling
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/engine.c4
-rw-r--r--source/blender/render/intern/render_result.c6
-rw-r--r--source/blender/render/intern/texture_image.c6
3 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index 84f12b7873b..769077c0e8c 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -376,8 +376,8 @@ void RE_engine_end_result(
pa->status = (!cancel && merge_results) ? PART_STATUS_MERGED : PART_STATUS_RENDERED;
}
else if (re->result->do_exr_tile) {
- /* if written result does not match any tile and we are using save
- * buffers, we are going to get openexr save errors */
+ /* If written result does not match any tile and we are using save
+ * buffers, we are going to get OpenEXR save errors. */
fprintf(stderr, "RenderEngine.end_result: dimensions do not match any OpenEXR tile.\n");
}
}
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 990373bafa0..dfce51ec3ab 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -737,8 +737,10 @@ static int order_render_passes(const void *a, const void *b)
return (rpa->view_id < rpb->view_id);
}
-/* From imbuf, if a handle was returned and
- * it's not a singlelayer multiview we convert this to render result. */
+/**
+ * From imbuf, if a handle was returned and
+ * it's not a single-layer multi-view we convert this to render result.
+ */
RenderResult *render_result_new_from_exr(
void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty)
{
diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c
index f0663b07a3c..5614318afbb 100644
--- a/source/blender/render/intern/texture_image.c
+++ b/source/blender/render/intern/texture_image.c
@@ -327,7 +327,7 @@ int imagewrap(Tex *tex,
texres->ta = 1.0f - texres->ta;
}
- /* de-premul, this is being premulled in shade_input_do_shade()
+ /* de-premul, this is being pre-multiplied in shade_input_do_shade()
* do not de-premul for generated alpha, it is already in straight */
if (texres->ta != 1.0f && texres->ta > 1e-4f && !(tex->imaflag & TEX_CALCALPHA)) {
fx = 1.0f / texres->ta;
@@ -1441,7 +1441,7 @@ static int imagewraposa_aniso(Tex *tex,
texres->nor[2] = 2.0f * (texres->tb - 0.5f);
}
- /* de-premul, this is being premulled in shade_input_do_shade()
+ /* de-premul, this is being pre-multiplied in shade_input_do_shade()
* TXF: this currently does not (yet?) work properly, destroys edge AA in clip/checker mode,
* so for now commented out also disabled in imagewraposa()
* to be able to compare results with blender's default texture filtering */
@@ -1970,7 +1970,7 @@ int imagewraposa(Tex *tex,
texres->nor[2] = 2.0f * (texres->tb - 0.5f);
}
- /* de-premul, this is being premulled in shade_input_do_shade() */
+ /* de-premul, this is being pre-multiplied in shade_input_do_shade() */
/* do not de-premul for generated alpha, it is already in straight */
if (texres->ta != 1.0f && texres->ta > 1e-4f && !(tex->imaflag & TEX_CALCALPHA)) {
mul_v3_fl(&texres->tr, 1.0f / texres->ta);