Commit: 2b14aa0a3930c1fc383b845b1eaab613a10a76ea
Author: Campbell Barton
Date: Mon Feb 7 15:33:10 2022 +1100
Branches: master
https://developer.blender.org/rB2b14aa0a3930c1fc383b845b1eaab613a10a76ea
Cleanup: spelling in comments
===================================================================
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/engines/image/image_drawing_mode.hh
M source/blender/gpu/intern/gpu_shader_create_info.hh
M source/blender/gpu/intern/gpu_shader_log.cc
M source/blender/gpu/opengl/gl_shader.cc
M source/blender/gpu/opengl/gl_shader_log.cc
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c
b/source/blender/bmesh/tools/bmesh_bevel.c
index 55c63a13efb..b429399f310 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -4132,7 +4132,7 @@ static VMesh *cubic_subdiv(BevelParams *bp, VMesh *vm_in)
for (int i = 0; i < n_boundary; i++) {
float co1[3], co2[3], acc[3];
EdgeHalf *e = bndv->elast;
- /* Generate tangents. This is hacked together and would ideally be done
elsewere and then only
+ /* Generate tangents. This is hacked together and would ideally be done
elsewhere and then only
* used here. */
float tangent[3], tangent2[3], normal[3];
bool convex = true;
@@ -4199,7 +4199,7 @@ static VMesh *cubic_subdiv(BevelParams *bp, VMesh *vm_in)
sub_v3_v3v3(co1, mesh_vert(vm_in, i, 0, 0)->co, mesh_vert(vm_in, i, 0,
1)->co);
sub_v3_v3v3(co2, mesh_vert(vm_in, i, 0, 1)->co, mesh_vert(vm_in, i, 0,
2)->co);
cross_v3_v3v3(tangent, co1, co2);
- /** The following constant is choosen to best match the old results. */
+ /** The following constant is chosen to best match the old results. */
normalize_v3_length(tangent, 1.5f / ns_out);
}
/** Copy corner vertex. */
diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh
b/source/blender/draw/engines/image/image_drawing_mode.hh
index cc85f1e098f..52d57ea2ba5 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -393,7 +393,7 @@ template<typename TextureMethod> class
ScreenSpaceDrawingMode : public AbstractD
*
* Returns true when a float buffer was created. Somehow the VSE cache
increases the ref
* counter, but might use a different mechanism for destructing the image,
that doesn't free the
- * rect_float as the refcounter isn't 0. To work around this we destruct any
created local
+ * rect_float as the reference-counter isn't 0. To work around this we
destruct any created local
* buffers ourself.
*/
bool ensure_float_buffer(ImBuf &image_buffer) const
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.hh
b/source/blender/gpu/intern/gpu_shader_create_info.hh
index ee5a79220b9..dafa741977c 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.hh
+++ b/source/blender/gpu/intern/gpu_shader_create_info.hh
@@ -130,7 +130,7 @@ enum class BuiltinBits {
GLOBAL_INVOCATION_ID = (1 << 5),
INSTANCE_ID = (1 << 6),
/**
- * Allow setting the target layer when the output is a layered framebuffer.
+ * Allow setting the target layer when the output is a layered frame-buffer.
* \note Emulated through geometry shader on older hardware.
*/
LAYER = (1 << 7),
diff --git a/source/blender/gpu/intern/gpu_shader_log.cc
b/source/blender/gpu/intern/gpu_shader_log.cc
index d20e49d3085..c879e912c5d 100644
--- a/source/blender/gpu/intern/gpu_shader_log.cc
+++ b/source/blender/gpu/intern/gpu_shader_log.cc
@@ -214,7 +214,7 @@ void Shader::print_log(Span<const char *> sources,
if (source_index > 0) {
row_in_file -= sources_end_line[source_index - 1];
}
- /* Print the filename the error line is comming from. */
+ /* Print the filename the error line is coming from. */
if (source_index > 0) {
StringRefNull filename =
shader::gpu_shader_dependency_get_filename_from_source_string(
sources[source_index]);
diff --git a/source/blender/gpu/opengl/gl_shader.cc
b/source/blender/gpu/opengl/gl_shader.cc
index 275f2c96bbd..48732918754 100644
--- a/source/blender/gpu/opengl/gl_shader.cc
+++ b/source/blender/gpu/opengl/gl_shader.cc
@@ -520,7 +520,7 @@ std::string GLShader::vertex_interface_declare(const
ShaderCreateInfo &info) con
ss << "\n/* Inputs. */\n";
for (const ShaderCreateInfo::VertIn &attr : info.vertex_inputs_) {
if (GLContext::explicit_location_support &&
- /* Fix issue with amdgpu-pro + workbench_prepass_mesh_vert.glsl being
quantized. */
+ /* Fix issue with AMDGPU-PRO + workbench_prepass_mesh_vert.glsl being
quantized. */
GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_OFFICIAL) ==
false) {
ss << "layout(location = " << attr.index << ") ";
}
diff --git a/source/blender/gpu/opengl/gl_shader_log.cc
b/source/blender/gpu/opengl/gl_shader_log.cc
index 0ee70b54f52..ec13bc44136 100644
--- a/source/blender/gpu/opengl/gl_shader_log.cc
+++ b/source/blender/gpu/opengl/gl_shader_log.cc
@@ -61,7 +61,7 @@ char *GLLogParser::parse_line(char *log_line, GPULogItem
&log_item)
log_item.cursor.column = -1;
}
else if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_UNIX,
GPU_DRIVER_OFFICIAL) &&
- /* WORKAROUND(@fclem): Both Mesa and amdgpu-pro are reported as
official. */
+ /* WORKAROUND(@fclem): Both Mesa and AMDGPU-PRO are reported as
official. */
StringRefNull(GPU_platform_version()).find(" Mesa ") == -1) {
/* source:row */
log_item.cursor.source = log_item.cursor.row;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
