[Bf-blender-cvs] [359aca8d4cf] master: Cleanup: Spelling, remove double negative

[Hans Goudey]

Commit: 359aca8d4cf9463d5c3ec7d0ab56ee52b2784eab
Author: Hans Goudey
Date:   Thu Aug 4 23:01:50 2022 -0500
Branches: master
https://developer.blender.org/rB359aca8d4cf9463d5c3ec7d0ab56ee52b2784eab

Cleanup: Spelling, remove double negative

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

M	source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
M	source/blender/draw/engines/select/select_engine.c
M	source/blender/nodes/shader/nodes/node_shader_geometry.cc
M	source/blender/nodes/shader/nodes/node_shader_hair_info.cc
M	source/blender/nodes/shader/nodes/node_shader_tex_coord.cc

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

diff --git a/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
index f28a809fdab..606292bbe83 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
@@ -96,7 +96,7 @@ void main()
   float dist_raw = texelFetch(lineTex, center_texel, 0).b;
   float dist = decode_line_dist(dist_raw);
 
-  /* TODO: Opti: use textureGather. */
+  /* TODO: Optimization: use textureGather. */
   vec4 neightbor_col0 = texelFetchOffset(colorTex, center_texel, 0, ivec2(1, 0));
   vec4 neightbor_col1 = texelFetchOffset(colorTex, center_texel, 0, ivec2(-1, 0));
   vec4 neightbor_col2 = texelFetchOffset(colorTex, center_texel, 0, ivec2(0, 1));
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 88ae5ac707e..026a1f52ac1 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -201,7 +201,7 @@ static void select_cache_populate(void *vedata, Object *ob)
 
   if (!e_data.context.is_dirty && sel_data && sel_data->is_drawn) {
     /* The object indices have already been drawn. Fill depth pass.
-     * Opti: Most of the time this depth pass is not used. */
+     * Optimization: Most of the time this depth pass is not used. */
     struct Mesh *me = ob->data;
     if (e_data.context.select_mode & SCE_SELECT_FACE) {
       struct GPUBatch *geom_faces = DRW_mesh_batch_cache_get_triangles_with_select_id(me);
diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.cc b/source/blender/nodes/shader/nodes/node_shader_geometry.cc
index 47df932f9d4..d23561de7ff 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geometry.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_geometry.cc
@@ -29,10 +29,9 @@ static int node_shader_gpu_geometry(GPUMaterial *mat,
   if (out[5].hasoutput) {
     GPU_material_flag_set(mat, GPU_MATFLAG_BARYCENTRIC);
   }
-  /* Opti: don't request orco if not needed. */
+  /* Optimization: don't request orco if not needed. */
   const float val[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-  GPUNodeLink *orco_link = (!out[2].hasoutput) ? GPU_constant(val) :
-                                                 GPU_attribute(mat, CD_ORCO, "");
+  GPUNodeLink *orco_link = out[2].hasoutput ? GPU_attribute(mat, CD_ORCO, "") : GPU_constant(val);
 
   const bool success = GPU_stack_link(mat, node, "node_geometry", in, out, orco_link);
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc
index 11d23e47735..f46556291ce 100644
--- a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc
@@ -23,8 +23,8 @@ static int node_shader_gpu_hair_info(GPUMaterial *mat,
 {
   /* Length: don't request length if not needed. */
   static const float zero = 0;
-  GPUNodeLink *length_link = (!out[2].hasoutput) ? GPU_constant(&zero) :
-                                                   GPU_attribute(mat, CD_HAIRLENGTH, "");
+  GPUNodeLink *length_link = out[2].hasoutput ? GPU_attribute(mat, CD_HAIRLENGTH, "") :
+                                                GPU_constant(&zero);
   return GPU_stack_link(mat, node, "node_hair_info", in, out, length_link);
 }
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc
index fb5971021fc..0a28b34902e 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc
@@ -41,9 +41,9 @@ static int node_shader_gpu_tex_coord(GPUMaterial *mat,
   GPUNodeLink *inv_obmat = (ob != NULL) ? GPU_uniform(&ob->imat[0][0]) :
                                           GPU_uniform(&dummy_matrix[0][0]);
 
-  /* Opti: don't request orco if not needed. */
+  /* Optimization: don't request orco if not needed. */
   float4 zero(0.0f);
-  GPUNodeLink *orco = (!out[0].hasoutput) ? GPU_constant(zero) : GPU_attribute(mat, CD_ORCO, "");
+  GPUNodeLink *orco = out[0].hasoutput ? GPU_attribute(mat, CD_ORCO, "") : GPU_constant(zero);
   GPUNodeLink *mtface = GPU_attribute(mat, CD_AUTO_FROM_NAME, "");
 
   GPU_stack_link(mat, node, "node_tex_coord", in, out, inv_obmat, orco, mtface);