[Bf-blender-cvs] [1a08a263884] master: Cleanup: spelling in comments

Campbell Barton noreply at git.blender.org
Tue Sep 13 05:30:25 CEST 2022


Commit: 1a08a263884af2a9fba44107fcddbc70f336b02b
Author: Campbell Barton
Date:   Tue Sep 13 13:24:44 2022 +1000
Branches: master
https://developer.blender.org/rB1a08a263884af2a9fba44107fcddbc70f336b02b

Cleanup: spelling in comments

===================================================================

M	intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M	intern/cycles/kernel/osl/closures_setup.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
M	source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
M	source/creator/creator.c

===================================================================

diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
index ac37a648a2c..9402ce11f7a 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
@@ -371,7 +371,7 @@ ccl_device void bsdf_microfacet_multi_ggx_blur(ccl_private ShaderClosure *sc, fl
 
 /* === Closure implementations === */
 
-/* Multiscattering GGX Glossy closure */
+/* Multi-scattering GGX Glossy closure */
 
 ccl_device int bsdf_microfacet_multi_ggx_common_setup(ccl_private MicrofacetBsdf *bsdf)
 {
@@ -546,7 +546,7 @@ ccl_device int bsdf_microfacet_multi_ggx_sample(KernelGlobals kg,
   return LABEL_REFLECT | LABEL_GLOSSY;
 }
 
-/* Multiscattering GGX Glass closure */
+/* Multi-scattering GGX Glass closure */
 
 ccl_device int bsdf_microfacet_multi_ggx_glass_setup(ccl_private MicrofacetBsdf *bsdf)
 {
diff --git a/intern/cycles/kernel/osl/closures_setup.h b/intern/cycles/kernel/osl/closures_setup.h
index 7972bba7d5c..f8d68444f90 100644
--- a/intern/cycles/kernel/osl/closures_setup.h
+++ b/intern/cycles/kernel/osl/closures_setup.h
@@ -397,7 +397,7 @@ ccl_device void osl_closure_microfacet_ggx_aniso_fresnel_setup(
   sd->flag |= bsdf_microfacet_ggx_fresnel_setup(bsdf, sd);
 }
 
-/* Multiscattering GGX closures */
+/* Multi-scattering GGX closures */
 
 ccl_device void osl_closure_microfacet_multi_ggx_setup(
     KernelGlobals kg,
@@ -522,7 +522,7 @@ ccl_device void osl_closure_microfacet_multi_ggx_aniso_setup(
   sd->flag |= bsdf_microfacet_multi_ggx_setup(bsdf);
 }
 
-/* Multiscattering GGX closures with Fresnel */
+/* Multi-scattering GGX closures with Fresnel */
 
 ccl_device void osl_closure_microfacet_multi_ggx_fresnel_setup(
     KernelGlobals kg,
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index b2ecd28e884..eef91bacc2f 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -718,7 +718,7 @@ void BKE_sculpt_sync_face_sets_visibility_to_grids(struct Mesh *mesh,
                                                    struct SubdivCCG *subdiv_ccg);
 
 /**
- * If a face set layer exists, initialize its visiblity (sign) from the mesh's hidden values.
+ * If a face set layer exists, initialize its visibility (sign) from the mesh's hidden values.
  */
 void BKE_sculpt_face_sets_update_from_base_mesh_visibility(struct Mesh *mesh);
 
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d28cefd4887..d53c0af2c54 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1714,9 +1714,9 @@ static int gpencil_strokes_paste_exec(bContext *C, wmOperator *op)
           }
         }
 
-        /* Ensure we have a frame to draw into
+        /* Ensure we have a frame to draw into.
          * NOTE: Since this is an op which creates strokes,
-         *       we resuse active frame or add a new frame if one
+         *       we reuse active frame or add a new frame if one
          *       doesn't exist already depending on REC button status.
          */
         if (IS_AUTOKEY_ON(scene) || (gpl->actframe == NULL)) {
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
index 0b94e4e43a3..32933a16c4d 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
@@ -56,16 +56,16 @@ struct MTLMaterial {
   std::string name;
   /* Always check for negative values while importing or exporting. Use defaults if
    * any value is negative. */
-  float spec_exponent{-1.0f};   /* Ns */
-  float3 ambient_color{-1.0f};  /* Ka */
-  float3 color{-1.0f};          /* Kd */
-  float3 spec_color{-1.0f};     /* Ks */
-  float3 emission_color{-1.0f}; /* Ke */
-  float ior{-1.0f};             /* Ni */
-  float alpha{-1.0f};           /* d */
+  float spec_exponent{-1.0f};   /* `Ns` */
+  float3 ambient_color{-1.0f};  /* `Ka` */
+  float3 color{-1.0f};          /* `Kd` */
+  float3 spec_color{-1.0f};     /* `Ks` */
+  float3 emission_color{-1.0f}; /* `Ke` */
+  float ior{-1.0f};             /* `Ni` */
+  float alpha{-1.0f};           /* `d` */
   int illum_mode{-1};
   MTLTexMap texture_maps[(int)MTLTexMapType::Count];
-  /* Only used for Normal Map node: "map_Bump". */
+  /* Only used for Normal Map node: `map_Bump`. */
   float normal_strength{-1.0f};
 };
 
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
index 76568b2ddb4..2819fe9efc8 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
@@ -257,7 +257,7 @@ static void set_bsdf_socket_values(bNode *bsdf, Material *mat, const MTLMaterial
     float clamped_ns = std::max(0.0f, std::min(1000.0f, mtl_mat.spec_exponent));
     roughness = 1.0f - sqrt(clamped_ns / 1000.0f);
   }
-  /* Metallic: average of Ka components. */
+  /* Metallic: average of `Ka` components. */
   float metallic = (mtl_mat.ambient_color[0] + mtl_mat.ambient_color[1] +
                     mtl_mat.ambient_color[2]) /
                    3;
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 7f236a39974..2d8b1e16098 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -286,12 +286,11 @@ int main(int argc,
   _putenv_s("OMP_WAIT_POLICY", "PASSIVE");
 #  endif
 
-  /* Win32 Unicode Arguments. */
-  /* NOTE: cannot use `guardedalloc` allocation here, as it's not yet initialized
-   *       (it depends on the arguments passed in, which is what we're getting here!)
-   */
 #  ifdef USE_WIN32_UNICODE_ARGS
+  /* Win32 Unicode Arguments. */
   {
+    /* NOTE: Can't use `guardedalloc` allocation here, as it's not yet initialized
+     * (it depends on the arguments passed in, which is what we're getting here!) */
     wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc);
     argv = malloc(argc * sizeof(char *));
     for (argv_num = 0; argv_num < argc; argv_num++) {



More information about the Bf-blender-cvs mailing list