Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-06-25 16:13:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-25 16:14:36 +0300
commitfd5c185bebd5a418634b2a8846f0aeea86327b20 (patch)
treee2f93d793fe173dce0a07c3a7e4385ed6850279d /intern/cycles
parentbaa0da3e69a1225cd18c075be5563c7d811b5347 (diff)
Cleanup: spelling
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/device/device_multi.cpp4
-rw-r--r--intern/cycles/kernel/geom/geom_curve_intersect.h4
-rw-r--r--intern/cycles/render/object.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 020b9e10e60..fd14bbdccc5 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -396,8 +396,8 @@ class MultiDevice : public Device {
size_t existing_size = mem.device_size;
/* This is a hack to only allocate the tile buffers on denoising devices
- * Similarily the tile buffers also need to be allocated separately on all devices so any
- * overlap rendered for denoising does not interfer with each other */
+ * Similarly the tile buffers also need to be allocated separately on all devices so any
+ * overlap rendered for denoising does not interfere with each other */
if (strcmp(mem.name, "RenderBuffers") == 0) {
vector<device_ptr> device_pointers;
device_pointers.reserve(devices.size());
diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/geom_curve_intersect.h
index 86f7f246c6e..c04dbee52cc 100644
--- a/intern/cycles/kernel/geom/geom_curve_intersect.h
+++ b/intern/cycles/kernel/geom/geom_curve_intersect.h
@@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN
/* Curve primitive intersection functions.
*
* The code here was adapted from curve_intersector_sweep.h in Embree, to get
- * an exact match betwee Embree CPU ray-tracing and our GPU ray-tracing. */
+ * an exact match between Embree CPU ray-tracing and our GPU ray-tracing. */
#define CURVE_NUM_BEZIER_SUBDIVISIONS 3
#define CURVE_NUM_BEZIER_SUBDIVISIONS_UNSTABLE (CURVE_NUM_BEZIER_SUBDIVISIONS + 1)
@@ -176,7 +176,7 @@ ccl_device bool curve_intersect_iterative(const float3 ray_dir,
{
const float length_ray_dir = len(ray_dir);
- /* Error of curve evaluations is propertional to largest coordinate. */
+ /* Error of curve evaluations is proportional to largest coordinate. */
const float4 box_min = min(min(curve[0], curve[1]), min(curve[2], curve[3]));
const float4 box_max = max(min(curve[0], curve[1]), max(curve[2], curve[3]));
const float4 box_abs = max(fabs(box_min), fabs(box_max));
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 405af57effc..c45ae5553a8 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -594,7 +594,7 @@ void ObjectManager::device_update_transforms(DeviceScene *dscene, Scene *scene,
numparticles += psys->particles.size();
}
- /* Parallel object update, with grain size to avoid too much threadng overhead
+ /* Parallel object update, with grain size to avoid too much threading overhead
* for individual objects. */
static const int OBJECTS_PER_TASK = 32;
parallel_for(blocked_range<size_t>(0, scene->objects.size(), OBJECTS_PER_TASK),