[Bf-blender-cvs] [cd6b49f995f] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Sun Jul 7 07:43:12 CEST 2019
Commit: cd6b49f995fdca5240a9b97fa99b4dd669a047ea
Author: Campbell Barton
Date: Sun Jul 7 15:38:41 2019 +1000
Branches: master
https://developer.blender.org/rBcd6b49f995fdca5240a9b97fa99b4dd669a047ea
Cleanup: spelling
===================================================================
M intern/cycles/bvh/bvh_embree.cpp
M intern/cycles/device/device_task.h
M intern/cycles/device/opencl/opencl.h
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_volume.h
M intern/cycles/kernel/split/kernel_next_iteration_setup.h
M intern/cycles/render/mesh_volume.cpp
M intern/cycles/util/util_math_matrix.h
M intern/ghost/intern/GHOST_WindowCocoa.mm
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/BLI_heap.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/storage.c
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/operators/bmo_inset.c
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/draw/intern/draw_cache.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_motion_paths.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/interface/interface_align.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
M source/blender/editors/util/select_buffer_utils.c
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/winged_edge/WXEdge.h
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/gpu/intern/gpu_matrix.c
M source/blender/windowmanager/intern/wm_utils.c
===================================================================
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 36d8a226722..b011bc63dbd 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -23,7 +23,7 @@
* usage.
*
* Since Embree allows object to be either curves or triangles but not both, Cycles object IDs are
- * maapped to Embree IDs by multiplying by two and adding one for curves.
+ * mapped to Embree IDs by multiplying by two and adding one for curves.
*
* This implementation shares RTCDevices between Cycles instances. Eventually each instance should
* get a separate RTCDevice to correctly keep track of memory usage.
diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index a04062ed4ef..f45de556492 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -34,7 +34,7 @@ class Tile;
class DenoiseParams {
public:
- /* Pixel radius for neighbouring pixels to take into account. */
+ /* Pixel radius for neighboring pixels to take into account. */
int radius;
/* Controls neighbor pixel weighting for the denoising filter. */
float strength;
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h
index 70773902790..82b961b8de7 100644
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@ -359,7 +359,7 @@ class OpenCLDevice : public Device {
~OpenCLSplitPrograms();
/* Load the kernels and put the created kernels in the given
- * `programs` paramter. */
+ * `programs` parameter. */
void load_kernels(vector<OpenCLProgram *> &programs,
const DeviceRequestedFeatures &requested_features,
bool is_preview = false);
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 68a10dd03b8..97cd3a3320c 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -128,7 +128,7 @@ ccl_device void camera_sample_perspective(KernelGlobals *kg,
#ifdef __RAY_DIFFERENTIALS__
/* Ray differentials, computed from scratch using the raster coordinates
* because we don't want to be affected by depth of field. We compute
- * ray origin and direction for the center and two neighbouring pixels
+ * ray origin and direction for the center and two neighboring pixels
* and simply take their differences. */
float3 Pnostereo = transform_point(&cameratoworld, make_float3(0.0f, 0.0f, 0.0f));
@@ -303,7 +303,7 @@ ccl_device_inline void camera_sample_panorama(ccl_constant KernelCamera *cam,
#ifdef __RAY_DIFFERENTIALS__
/* Ray differentials, computed from scratch using the raster coordinates
* because we don't want to be affected by depth of field. We compute
- * ray origin and direction for the center and two neighbouring pixels
+ * ray origin and direction for the center and two neighboring pixels
* and simply take their differences. */
float3 Pcenter = Pcamera;
float3 Dcenter = panorama_to_direction(cam, Pcenter.x, Pcenter.y);
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index c80124d3eb2..4963e012e15 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -687,7 +687,7 @@ ccl_device_inline const ShaderClosure *shader_bsdf_pick(ShaderData *sd, float *r
sampled = i;
/* Rescale to reuse for direction sample, to better
- * preserve stratifaction. */
+ * preserve stratification. */
*randu = (r - partial_sum) / sc->sample_weight;
break;
}
diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h
index 07201819030..6640f64518a 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -427,7 +427,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg,
}
const uint max_hits = transparent_max_bounce - state->transparent_bounce - 1;
# ifdef __KERNEL_GPU__
- /* On GPU we do trickey with tracing opaque ray first, this avoids speed
+ /* On GPU we do tricky with tracing opaque ray first, this avoids speed
* regressions in some files.
*
* TODO(sergey): Check why using record-all behavior causes slowdown in such
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 1705f58b87d..cc85110bdd8 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -111,8 +111,8 @@ ccl_device bool volume_stack_is_heterogeneous(KernelGlobals *kg, ccl_addr_space
}
else if (shader_flag & SD_NEED_ATTRIBUTES) {
/* We want to render world or objects without any volume grids
- * as homogenous, but can only verify this at runtime since other
- * heterogenous volume objects may be using the same shader. */
+ * as homogeneous, but can only verify this at run-time since other
+ * heterogeneous volume objects may be using the same shader. */
int object = stack[i].object;
if (object != OBJECT_NONE) {
int object_flag = kernel_tex_fetch(__object_flag, object);
diff --git a/intern/cycles/kernel/split/kernel_next_iteration_setup.h b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
index 3c2f6038035..320f6a414bf 100644
--- a/intern/cycles/kernel/split/kernel_next_iteration_setup.h
+++ b/intern/cycles/kernel/split/kernel_next_iteration_setup.h
@@ -109,7 +109,7 @@ ccl_device void kernel_next_iteration_setup(KernelGlobals *kg,
if (ccl_global_id(0) == 0 && ccl_global_id(1) == 0) {
/* If we are here, then it means that scene-intersect kernel
- * has already been executed atleast once. From the next time,
+ * has already been executed at least once. From the next time,
* scene-intersect kernel may operate on queues to fetch ray index
*/
*kernel_split_params.use_queues_flag = 1;
diff --git a/intern/cycles/render/mesh_volume.cpp b/intern/cycles/render/mesh_volume.cpp
index a1d61fd4db7..f451b58e92a 100644
--- a/intern/cycles/render/mesh_volume.cpp
+++ b/intern/cycles/render/mesh_volume.cpp
@@ -135,18 +135,18 @@ static const int CUBE_SIZE = 8;
*
* The way the algorithm works is as follows:
*
- * - the coordinates of active voxels from a dense volume (or 3d image) are
- * gathered inside an auxialliary volume.
- * - each set of coordinates of an CUBE_SIZE cube are mapped to the same
- * coordinate of the auxilliary volume.
- * - quads are created between active and non-active voxels in the auxialliary
- * volume to generate a tight mesh around the volume.
+ * - The coordinates of active voxels from a dense volume (or 3d image) are
+ * gathered inside an auxiliary volume.
+ * - Each set of coordinates of an CUBE_SIZE cube are mapped to the same
+ * coordinate of the auxiliary volume.
+ * - Quads are created between active and non-active voxels in the auxiliary
+ * volume to generate a tight mesh around the volume.
*/
class VolumeMeshBuilder {
- /* Auxilliary volume that is used to check if a node already added. */
+ /* Auxiliary volume that is used to check if a node already added. */
vector<char> grid;
- /* The resolution of the auxilliary volume, set to be equal to 1/CUBE_SIZE
+ /* The resolution of the auxiliary volume, set to be equal to 1/CUBE_SIZE
* of the original volume on each axis. */
int3 res;
diff --git a/intern/cycles/util/util_math_matrix.h b/intern/cycles/util/util_math_matrix.h
index a8fe5f8cc2c..1dc661a7aa7 100644
--- a/intern/cycles/util/util_math_matrix.h
+++ b/intern/cycles/util/util_math_matrix.h
@@ -236,7 +236,7 @@ ccl_device_inline void math_trimatrix_vec3_solve(ccl_global float *A,
}
}
-/* Perform the Jacobi Eigenvalue Methon on matrix A.
+/* Perform the Jacobi Eigenvalue Method on matrix A.
* A is assumed to be a symmetrical matrix, therefore only the lower-triangular part is ever
* accessed. The algorithm overwrites the contents of A.
*
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 9c988d075cd..cb4100c1188 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -731,7 +731,7 @@ void GHOST_WindowCocoa::setNativePixelSize(void)
* \note Fullscreen switch is not actual fullscreen with display capture.
* As this capture removes all OS X window manager features.
*
- * Instead, the menu bar and the dock are hidden, and the window is made borderless and enlarged.
+ * Instead, the menu bar and the dock are hidden, and the window is made border-less and enlarged.
* Thus, process switch, exposé, spaces, ... still work in fullscreen mode
*/
GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index d616c74520a..1f2f8ee57bf 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -52,10 +52,10 @@ struct bGPDstroke;
((((_md)->mode & eGpencilModifierMode_Editmode) == 0) && (_is_edit))
typedef enum {
- /* Should not be used, only for None modifier type */
+ /** Should not be used, only for None modifier type. */
eGpencilModifierTypeType_None,
- /* grease pencil modifiers */
+ /** Grease pencil modifiers. */
eGpencilModifierTypeType_Gpencil,
} GpencilModifierTypeType;
@@ -63,25 +63,26 @@ typedef enum {
eGpencilModifierTypeFlag_SupportsMapping = (1 << 0),
eGpencilModifierTypeFlag_SupportsEditmode = (1 << 1),
- /* For modifiers that support editmode this determines if the
- * modifier should be enabled by default in editmode. This should
+ /**
+ * For modifiers that support edit-mode this determines if the
+ * modifier should be enabled by default in edit-mode. This should
* only be used by modifiers that are relatively speedy and
- * also generally used in editmode, otherwise let the user enable
- * it by hand.
+ * also generally used in edit-mode, otherwise let the user enable it by hand.
*/
eGpencilModifierTypeFlag_EnableInEditmode = (1 << 2
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list