[Bf-blender-cvs] [6529d20d79a] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Wed Jun 12 01:45:09 CEST 2019
Commit: 6529d20d79a5e55696a2fa48150055d3e4a942dd
Author: Campbell Barton
Date: Wed Jun 12 09:04:10 2019 +1000
Branches: master
https://developer.blender.org/rB6529d20d79a5e55696a2fa48150055d3e4a942dd
Cleanup: spelling in comments
===================================================================
M intern/cycles/blender/blender_python.cpp
M intern/cycles/kernel/closure/bssrdf.h
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/session.cpp
M intern/cycles/subd/subd_dice.cpp
M intern/cycles/util/util_math_matrix.h
M intern/cycles/util/util_task.cpp
M intern/ghost/GHOST_C-api.h
M intern/ghost/intern/GHOST_DropTargetWin32.h
M intern/ghost/intern/GHOST_WindowX11.cpp
M source/blender/blenkernel/BKE_animsys.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_shader_fx.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/library_remap.c
M source/blender/blenkernel/intern/lightprobe.c
M source/blender/blenkernel/intern/main.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/seqcache.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/subdiv_converter_mesh.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenlib/intern/expr_pylike_eval.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/scanfill.c
M source/blender/blenlib/intern/string_utils.c
M source/blender/blenlib/intern/threads.c
M source/blender/blenloader/intern/blend_validate.c
M source/blender/blenloader/intern/readblenentry.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_walkers.c
M source/blender/bmesh/intern/bmesh_walkers.h
M source/blender/compositor/COM_defines.h
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/node/deg_node_operation.h
M source/blender/draw/engines/eevee/eevee_bloom.c
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_lookdev.c
M source/blender/draw/engines/eevee/eevee_screen_raytrace.c
M source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
M source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
M source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager.h
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_query.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/resources.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/imbuf/intern/cineon/logImageCore.h
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_lightprobe_types.h
M source/blender/makesdna/DNA_sound_types.h
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/python/generic/py_capi_utils.c
M source/blender/python/intern/bpy_rna_id_collection.c
M source/blender/python/mathutils/mathutils.c
M source/blender/python/mathutils/mathutils_Quaternion.c
M source/blender/python/mathutils/mathutils_bvhtree.c
M source/blender/python/mathutils/mathutils_geometry.c
M source/blender/render/intern/source/bake_api.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_gesture_ops.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_operator_type.c
===================================================================
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;
}
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index ea9d6925e23..b54c097c2ab 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -446,8 +446,8 @@ extern GHOST_TSuccess GHOST_GetButtonState(GHOST_SystemHandle systemhandle,
***************************************************************************************/
/**
- * Sets 3D mouse deadzone
- * \param deadzone Deadzone of the 3D mouse (both for rotation and pan) relative to full range
+ * Sets 3D mouse dead-zone.
+ * \param deadzone: Dead-zone of the 3D mouse (both for rotation and pan) relative to full range.
*/
extern void GHOST_setNDOFDeadZone(float deadzone);
#endif
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h
index 588d89f1549..ee124f3ba0e 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.h
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.h
@@ -89,7 +89,7 @@ class GHOST_DropTargetWin32 : public IDropTarget {
/* Internal helper functions */
/**
- * Base the effect on those allowed by the dropsource.
+ * Base the effect on those allowed by the drop-source.
* \param dwAllowed Drop sources allowed drop effect.
* \return The allowed drop effect.
*/
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index a8cbb874c50..48bdfa37565 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -957,7 +957,7 @@ GHOST_TWindowState GHOST_WindowX11::getState() const
state = icccmGetState();
/*
* In the Iconic and Withdrawn state, the window
- * is unmaped, so only need return a Minimized state.
+ * is unmapped, so only need return a Minimized state.
*/
if ((state == IconicState) || (state == WithdrawnState))
state_ret = GHOST_kWindowStateMinimized;
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index 583a90b2dee..64a8c78cfef 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -170,7 +170,7 @@ void BKE_animdata_fix_paths_rename_all(struct ID *ref_id,
const char *newName);
/* Fix the path after removing elements that are not ID (e.g., node).
- * Returen truth if any animation data was affected. */
+ * Return true if any animation data was affected. */
bool BKE_animdata_fix_paths_remove(struct ID *id, const char *path);
/* -----------------------------------
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list