Merge remote-tracking branch 'origin/master' into lineart-bvhlineart-bvh

7 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/render/RE_texture.h b/source/blender/render/RE_texture.h
index b394cfeee75..39d773777ab 100644
--- a/source/blender/render/RE_texture.h
+++ b/source/blender/render/RE_texture.h
@@ -79,7 +79,7 @@ void RE_point_density_fix_linking(void);
 /* texture_procedural.c */
 
 /* Texture evaluation result.
- * Note; tr tg tb ta has to remain in this order for array access. */
+ * NOTE: tr tg tb ta has to remain in this order for array access. */
 typedef struct TexResult {
   float tin, tr, tg, tb, ta;
   int talpha;
diff --git a/source/blender/render/intern/bake.c b/source/blender/render/intern/bake.c
index 340a35eac15..07c08f3cfbe 100644
--- a/source/blender/render/intern/bake.c
+++ b/source/blender/render/intern/bake.c
@@ -550,7 +550,7 @@ bool RE_bake_pixels_populate_from_objects(struct Mesh *me_low,
   Mesh **me_highpoly;
   BVHTreeFromMesh *treeData;
 
-  /* Note: all coordinates are in local space */
+  /* NOTE: all coordinates are in local space. */
   TriTessFace *tris_low = NULL;
   TriTessFace *tris_cage = NULL;
   TriTessFace **tris_high;
@@ -752,10 +752,10 @@ void RE_bake_pixels_populate(Mesh *me,
     for (int a = 0; a < 3; a++) {
       const float *uv = mloopuv[lt->tri[a]].uv;
 
-      /* Note, workaround for pixel aligned UVs which are common and can screw up our
+      /* NOTE(campbell): workaround for pixel aligned UVs which are common and can screw up our
        * intersection tests where a pixel gets in between 2 faces or the middle of a quad,
        * camera aligned quads also have this problem but they are less common.
-       * Add a small offset to the UVs, fixes bug T18685 - Campbell */
+       * Add a small offset to the UVs, fixes bug T18685. */
       vec[a][0] = uv[0] * (float)bd.bk_image->width - (0.5f + 0.001f);
       vec[a][1] = uv[1] * (float)bd.bk_image->height - (0.5f + 0.002f);
     }
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index db2458a636b..86ed88d37ab 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -124,7 +124,7 @@ bool RE_engine_is_external(const Render *re)
 
 bool RE_engine_is_opengl(RenderEngineType *render_type)
 {
-  /* TODO refine? Can we have ogl render engine without ogl render pipeline? */
+  /* TODO: refine? Can we have ogl render engine without ogl render pipeline? */
   return (render_type->draw_engine != NULL) && DRW_engine_render_support(render_type->draw_engine);
 }
 
@@ -310,7 +310,7 @@ RenderResult *RE_engine_begin_result(
 
   result = render_result_new(re, &disprect, RR_USE_MEM, layername, viewname);
 
-  /* todo: make this thread safe */
+  /* TODO: make this thread safe. */
 
   /* can be NULL if we CLAMP the width or height to 0 */
   if (result) {
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index d3ea27c6bb0..bc03158f036 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -1464,7 +1464,7 @@ static void do_render_full_pipeline(Render *re)
     /* in this case external render overrides all */
   }
   else if (RE_seq_render_active(re->scene, &re->r)) {
-    /* note: do_render_sequencer() frees rect32 when sequencer returns float images */
+    /* NOTE: do_render_sequencer() frees rect32 when sequencer returns float images. */
     if (!re->test_break(re->tbh)) {
       do_render_sequencer(re);
       render_seq = true;
@@ -2419,7 +2419,7 @@ void RE_RenderAnim(Render *re,
 
       render_update_depsgraph(re);
 
-      /* only border now, todo: camera lens. (ton) */
+      /* Only border now, TODO(ton): camera lens. */
       render_init_from_main(re, &rd, bmain, scene, single_layer, camera_override, 1, 0);
 
       if (nfra != scene->r.cfra) {
@@ -2612,7 +2612,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
   }
 }
 
-/* note; repeated win/disprect calc... solve that nicer, also in compo */
+/* NOTE: repeated win/disprect calc... solve that nicer, also in compo. */
 
 /* only the temp file! */
 bool RE_ReadRenderResult(Scene *scene, Scene *scenode)
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 70bd4f92512..53252cdb42f 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -473,15 +473,15 @@ RenderResult *render_result_new(
       render_layer_add_pass(rr, rl, 4, RE_PASSNAME_COMBINED, view, "RGBA");
     }
 
-    /* note, this has to be in sync with scene.c */
+    /* NOTE: this has to be in sync with `scene.c`. */
     rl->layflag = 0x7FFF; /* solid ztra halo strand */
     rl->passflag = SCE_PASS_COMBINED;
 
     re->active_view_layer = 0;
   }
 
-  /* border render; calculate offset for use in compositor. compo is centralized coords */
-  /* XXX obsolete? I now use it for drawing border render offset (ton) */
+  /* Border render; calculate offset for use in compositor. compo is centralized coords. */
+  /* XXX(ton): obsolete? I now use it for drawing border render offset. */
   rr->xof = re->disprect.xmin + BLI_rcti_cent_x(&re->disprect) - (re->winx / 2);
   rr->yof = re->disprect.ymin + BLI_rcti_cent_y(&re->disprect) - (re->winy / 2);
 
@@ -1016,7 +1016,7 @@ bool RE_WriteRenderResult(ReportList *reports,
     IMB_exr_write_channels(exrhandle);
   }
   else {
-    /* TODO, get the error from openexr's exception */
+    /* TODO: get the error from openexr's exception. */
     BKE_reportf(
         reports, RPT_ERROR, "Error writing render result, %s (see console)", strerror(errno));
   }
diff --git a/source/blender/render/intern/render_types.h b/source/blender/render/intern/render_types.h
index 9f399971049..50b684beba9 100644
--- a/source/blender/render/intern/render_types.h
+++ b/source/blender/render/intern/render_types.h
@@ -153,7 +153,7 @@ struct Render {
   void **movie_ctx_arr;
   char viewname[MAX_NAME];
 
-  /* TODO replace by a whole draw manager. */
+  /* TODO: replace by a whole draw manager. */
   void *gl_context;
   void *gpu_context;
 };
diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c
index 9f6980a5b0a..c4ee16a0ecc 100644
--- a/source/blender/render/intern/texture_image.c
+++ b/source/blender/render/intern/texture_image.c
@@ -634,11 +634,11 @@ static void boxsample(ImBuf *ibuf,
    * If variable 'imaprepeat' has been set, the
    * clipped-away parts are sampled as well.
    */
-  /* note: actually minx etc isn't in the proper range...
-   *       this due to filter size and offset vectors for bump */
-  /* note: talpha must be initialized */
-  /* note: even when 'imaprepeat' is set, this can only repeat once in any direction.
-   * the point which min/max is derived from is assumed to be wrapped */
+  /* NOTE: actually minx etc isn't in the proper range...
+   *       this due to filter size and offset vectors for bump. */
+  /* NOTE: talpha must be initialized. */
+  /* NOTE: even when 'imaprepeat' is set, this can only repeat once in any direction.
+   * the point which min/max is derived from is assumed to be wrapped. */
   TexResult texr;
   rctf *rf, stack[8];
   float opp, tot, alphaclip = 1.0;