Commit: 357547b010a5a0ec5434f35571ea93cddf5be4a5
Author: Campbell Barton
Date: Thu Aug 13 16:21:10 2020 +1000
Branches: master
https://developer.blender.org/rB357547b010a5a0ec5434f35571ea93cddf5be4a5
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/scene.c
M source/blender/gpu/opengl/gl_context.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/constraint.c
b/source/blender/blenkernel/intern/constraint.c
index 01ce95d9d70..047f927ae88 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -602,8 +602,7 @@ static void constraint_target_to_mat4(Object *ob,
pchan = BKE_pose_channel_find_name(ob->pose, substring);
if (pchan) {
/* Multiply the PoseSpace accumulation/final matrix for this
- * PoseChannel by the Armature Object's Matrix to get a worldspace
- * matrix.
+ * PoseChannel by the Armature Object's Matrix to get a world-space
matrix.
*/
bool is_bbone = (pchan->bone) && (pchan->bone->segments > 1) &&
(flag & CONSTRAINT_BBONE_SHAPE);
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c
b/source/blender/blenkernel/intern/mball_tessellate.c
index 92e16be878f..2a7d3f1797d 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -405,7 +405,7 @@ static float densfunc(const MetaElem *ball, float x, float
y, float z)
}
/**
- * Computes density at given position form all metaballs which contain this
point in their box.
+ * Computes density at given position form all meta-balls which contain this
point in their box.
* Traverses BVH using a queue.
*/
static float metaball(PROCESS *process, float x, float y, float z)
@@ -1443,9 +1443,9 @@ void BKE_mball_polygonize(Depsgraph *depsgraph, Scene
*scene, Object *ob, ListBa
if (process.totelem > 0) {
build_bvh_spatial(&process, &process.metaball_bvh, 0, process.totelem,
&process.allbb);
- /* Don't polygonize metaballs with too high resolution (base mball to
small)
- * note: Eps was 0.0001f but this was giving problems for blood animation
for durian,
- * using 0.00001f. */
+ /* Don't polygonize meta-balls with too high resolution (base mball to
small)
+ * note: Eps was 0.0001f but this was giving problems for blood animation
for
+ * the open movie "Sintel", using 0.00001f. */
if (ob->scale[0] > 0.00001f * (process.allbb.max[0] -
process.allbb.min[0]) ||
ob->scale[1] > 0.00001f * (process.allbb.max[1] -
process.allbb.min[1]) ||
ob->scale[2] > 0.00001f * (process.allbb.max[2] -
process.allbb.min[2])) {
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index bdda03bab12..7e25e8c96ae 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1002,7 +1002,7 @@ Scene *BKE_scene_set_name(Main *bmain, const char *name)
return NULL;
}
-/* Used by metaballs, return *all* objects (including duplis)
+/* Used by meta-balls, return *all* objects (including duplis)
* existing in the scene (including scene's sets). */
int BKE_scene_base_iter_next(
Depsgraph *depsgraph, SceneBaseIter *iter, Scene **scene, int val, Base
**base, Object **ob)
@@ -1073,7 +1073,7 @@ int BKE_scene_base_iter_next(
else {
if (iter->phase != F_DUPLI) {
if (depsgraph && (*base)->object->transflag & OB_DUPLI) {
- /* collections cannot be duplicated for metaballs yet,
+ /* Collections cannot be duplicated for meta-balls yet,
* this enters eternal loop because of
* makeDispListMBall getting called inside of collection_duplilist
*/
if ((*base)->object->instance_collection == NULL) {
diff --git a/source/blender/gpu/opengl/gl_context.cc
b/source/blender/gpu/opengl/gl_context.cc
index 37c84abaa7f..00a10924ff6 100644
--- a/source/blender/gpu/opengl/gl_context.cc
+++ b/source/blender/gpu/opengl/gl_context.cc
@@ -193,7 +193,7 @@ void GLBackend::tex_free(GLuint tex_id)
/** \name Linked object deletion
*
* These objects contain data that are stored per context. We
- * need to do some cleanup if they are used accross context or if context
+ * need to do some cleanup if they are used across context or if context
* is discarded.
* \{ */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
