diff options
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_passes.h | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 | ||||
-rw-r--r-- | intern/cycles/render/session.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/subd/subd_dice.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_math_matrix.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_task.cpp | 4 |
9 files changed, 16 insertions, 15 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 3ab8c8bd6d9..80c6fee9723 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -138,7 +138,7 @@ static const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce) const char *result = _PyUnicode_AsString(py_str); if (result) { /* 99% of the time this is enough but we better support non unicode - * chars since blender doesnt limit this. + * chars since blender doesn't limit this. */ return result; } @@ -151,7 +151,7 @@ static const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce) return PyBytes_AS_STRING(*coerce); } else { - /* Clear the error, so Cycles can be at leadt used without + /* Clear the error, so Cycles can be at least used without * GPU and OSL support, */ PyErr_Clear(); diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h index 125ca4dd830..0da4d6bd060 100644 --- a/intern/cycles/kernel/closure/bssrdf.h +++ b/intern/cycles/kernel/closure/bssrdf.h @@ -226,7 +226,7 @@ ccl_device float bssrdf_burley_eval(const float d, float r) if (r >= Rm) return 0.0f; - /* Burley refletance profile, equation (3). + /* Burley reflectance profile, equation (3). * * NOTES: * - Surface albedo is already included into sc->weight, no need to diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 1085930c33a..68a10dd03b8 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -377,9 +377,9 @@ ccl_device_inline void camera_sample(KernelGlobals *kg, const int shutter_table_offset = kernel_data.cam.shutter_table_offset; ray->time = lookup_table_read(kg, time, shutter_table_offset, SHUTTER_TABLE_SIZE); /* TODO(sergey): Currently single rolling shutter effect type only - * where scanlines are acquired from top to bottom and whole scanline + * where scan-lines are acquired from top to bottom and whole scanline * is acquired at once (no delay in acquisition happens between pixels - * of single scanline). + * of single scan-line). * * Might want to support more models in the future. */ diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h index 462ec037ee7..e84937e2fd9 100644 --- a/intern/cycles/kernel/kernel_passes.h +++ b/intern/cycles/kernel/kernel_passes.h @@ -71,8 +71,9 @@ ccl_device_inline void kernel_write_pass_float_variance(ccl_global float *buffer { kernel_write_pass_float(buffer, value); - /* The online one-pass variance update that's used for the megakernel can't easily be implemented - * with atomics, so for the split kernel the E[x^2] - 1/N * (E[x])^2 fallback is used. */ + /* The online one-pass variance update that's used for the mega-kernel can't easily be + * implemented with atomics, + * so for the split kernel the E[x^2] - 1/N * (E[x])^2 fallback is used. */ kernel_write_pass_float(buffer + 1, value * value); } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 08c0c199af6..b93af6c068c 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -314,7 +314,7 @@ enum PathRayFlag { /* Ray is to be terminated, but continue with transparent bounces and * emission as long as we encounter them. This is required to make the * MIS between direct and indirect light rays match, as shadow rays go - * through transparent surfaces to reach emisison too. */ + * through transparent surfaces to reach emission too. */ PATH_RAY_TERMINATE_AFTER_TRANSPARENT = (1 << 21), /* Ray is to be terminated. */ PATH_RAY_TERMINATE = (PATH_RAY_TERMINATE_IMMEDIATE | PATH_RAY_TERMINATE_AFTER_TRANSPARENT), @@ -1148,7 +1148,7 @@ typedef struct KernelCamera { ProjectionTransform worldtondc; Transform worldtocamera; - /* Stores changes in the projeciton matrix. Use for camera zoom motion + /* Stores changes in the projection matrix. Use for camera zoom motion * blur and motion pass output for perspective camera. */ ProjectionTransform perspective_pre; ProjectionTransform perspective_post; diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 29eb779a7d6..da2be0b147b 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -184,8 +184,8 @@ bool Session::draw_gpu(BufferParams &buffer_params, DeviceDrawParams &draw_param /* then verify the buffers have the expected size, so we don't * draw previous results in a resized window */ if (!buffer_params.modified(display->params)) { - /* for CUDA we need to do tonemapping still, since we can - * only access GL buffers from the main thread */ + /* for CUDA we need to do tone-mapping still, since we can + * only access GL buffers from the main thread. */ if (gpu_need_tonemap) { thread_scoped_lock buffers_lock(buffers_mutex); tonemap(tile_manager.state.sample); diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp index 6b062ecfea2..fb96be5065b 100644 --- a/intern/cycles/subd/subd_dice.cpp +++ b/intern/cycles/subd/subd_dice.cpp @@ -317,7 +317,7 @@ void QuadDice::dice(SubPatch &sub, EdgeFactors &ef) int Mu = max(ef.tu0, ef.tu1); int Mv = max(ef.tv0, ef.tv1); -#if 0 /* Doesnt work very well, especially at grazing angles. */ +#if 0 /* Doesn't work very well, especially at grazing angles. */ float S = scale_factor(sub, ef, Mu, Mv); #else float S = 1.0f; diff --git a/intern/cycles/util/util_math_matrix.h b/intern/cycles/util/util_math_matrix.h index e1c7d5d838f..a8fe5f8cc2c 100644 --- a/intern/cycles/util/util_math_matrix.h +++ b/intern/cycles/util/util_math_matrix.h @@ -198,7 +198,7 @@ ccl_device void math_trimatrix_cholesky(ccl_global float *A, int n, int stride) } /* Solve A*S=y for S given A and y, - * where A is symmetrical positive-semidefinite and both inputs are destroyed in the process. + * where A is symmetrical positive-semi-definite and both inputs are destroyed in the process. * * We can apply Cholesky decomposition to find a lower triangular L so that L*Lt = A. * With that we get (L*Lt)*S = L*(Lt*S) = L*b = y, defining b as Lt*S. diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 2f771e2717e..fdbc3800806 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -243,7 +243,7 @@ vector<int> distribute_threads_on_nodes(const int num_threads) if (num_active_group_processors >= num_threads) { /* If the current thread is set up in a way that its affinity allows to * use at least requested number of threads we do not explicitly set - * affinity to the worker therads. + * affinity to the worker threads. * This way we allow users to manually edit affinity of the parent * thread, and here we follow that affinity. This way it's possible to * have two Cycles/Blender instances running manually set to a different @@ -254,7 +254,7 @@ vector<int> distribute_threads_on_nodes(const int num_threads) vector<int> num_per_node_processors; get_per_node_num_processors(&num_per_node_processors); if (num_per_node_processors.size() == 0) { - /* Error was already repported, here we can't do anything, so we simply + /* Error was already reported, here we can't do anything, so we simply * leave default affinity to all the worker threads. */ return thread_nodes; } |