Commit: 001f2c5d50b496708ef12de2c083686996b678d9
Author: Campbell Barton
Date: Tue Dec 15 12:27:16 2020 +1100
Branches: master
https://developer.blender.org/rB001f2c5d50b496708ef12de2c083686996b678d9
Cleanup: spelling
===================================================================
M intern/cycles/device/cuda/device_cuda_impl.cpp
M intern/cycles/device/opencl/opencl_util.cpp
M source/blender/blenkernel/intern/gpencil_geom.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/interface/interface_templates.c
===================================================================
diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp
b/intern/cycles/device/cuda/device_cuda_impl.cpp
index 6c26b247743..48151365e5d 100644
--- a/intern/cycles/device/cuda/device_cuda_impl.cpp
+++ b/intern/cycles/device/cuda/device_cuda_impl.cpp
@@ -718,7 +718,7 @@ void CUDADevice::init_host_memory()
void CUDADevice::load_texture_info()
{
if (need_texture_info) {
- /* Unset flag before copying, so this does not loop indenfinetly if the
copy below calls
+ /* Unset flag before copying, so this does not loop indefinitely if the
copy below calls
* into 'move_textures_to_host' (which calls 'load_texture_info' again). */
need_texture_info = false;
texture_info.copy_to_device();
diff --git a/intern/cycles/device/opencl/opencl_util.cpp
b/intern/cycles/device/opencl/opencl_util.cpp
index a9a474c7d77..be9efcd43ee 100644
--- a/intern/cycles/device/opencl/opencl_util.cpp
+++ b/intern/cycles/device/opencl/opencl_util.cpp
@@ -789,7 +789,7 @@ bool OpenCLInfo::device_supported(const string
&platform_name, const cl_device_i
}
# ifdef __APPLE__
- /* Apple uses own framework, which can also put Iris onto AMD framerwork.
+ /* Apple uses own framework, which can also put Iris onto AMD frame-work.
* This isn't supported configuration. */
return false;
# else
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c
b/source/blender/blenkernel/intern/gpencil_geom.c
index df755e96216..981f5d50353 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -3282,8 +3282,8 @@ static tSampleEdge
*new_sample_edge_from_sample_points(tSamplePoint *from, tSamp
* Does not change the shape of the stroke. The new points will be distributed
as
* uniformly as possible by repeatedly subdividing the current longest edge.
*
- * \param gps: The stroke to be upsampled.
- * \param target_number: The number of points the upsampled stroke should have.
+ * \param gps: The stroke to be up-sampled.
+ * \param target_number: The number of points the up-sampled stroke should
have.
* \param select: Select/Deselect the stroke.
*/
void BKE_gpencil_stroke_uniform_subdivide(bGPdata *gpd,
diff --git a/source/blender/editors/gpencil/gpencil_data.c
b/source/blender/editors/gpencil/gpencil_data.c
index 093f1fa89c7..aff109eb98e 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1332,8 +1332,8 @@ static int gpencil_merge_layer_exec(bContext *C,
wmOperator *op)
}
/* Read all frames from merge layer and add any missing in destination layer,
- * copying all previous strokes to keep the image equals. Need to do it in a
separated
- * loop to avoid strokes acumulation. */
+ * copying all previous strokes to keep the image equals.
+ * Need to do it in a separated loop to avoid strokes accumulation. */
LISTBASE_FOREACH (bGPDframe *, gpf_src, &gpl_src->frames) {
/* Try to find frame in destination layer hash table. */
bGPDframe *gpf_dst = BLI_ghash_lookup(gh_frames_dst,
POINTER_FROM_INT(gpf_src->framenum));
diff --git a/source/blender/editors/interface/interface_templates.c
b/source/blender/editors/interface/interface_templates.c
index 352afe72e76..dec2312b549 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -6173,7 +6173,7 @@ void uiTemplateList(uiLayout *layout,
org_i,
flt_flag);
- /* Items should be able to set context pointers for the layout. But
the listrow button
+ /* Items should be able to set context pointers for the layout. But
the list-row button
* swallows events, so it needs the context storage too for handlers
to see it. */
but->context = uiLayoutGetContextStore(sub);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs