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>2019-06-15 02:24:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-15 02:24:38 +0300
commit0fd96b4128ffb5d24d01c8a937046720dd2f2fbe (patch)
tree07f8f22201ba6e81def07cf1d1d5f4739956104b /source/blender/blenkernel
parentedda93caf9ae4993cb66309c008a28245f4c3d37 (diff)
Cleanup: spelling
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/image.c2
-rw-r--r--source/blender/blenkernel/intern/library_override.c4
-rw-r--r--source/blender/blenkernel/intern/library_remap.c2
-rw-r--r--source/blender/blenkernel/intern/subdiv_eval.c5
-rw-r--r--source/blender/blenkernel/intern/workspace.c2
5 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 14b6bc953b2..d94ede0e69e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -247,7 +247,7 @@ void BKE_image_free_buffers_ex(Image *ima, bool do_lock)
}
if (!G.background) {
- /* Background mode doesn't use opnegl,
+ /* Background mode doesn't use OpenGL,
* so we can avoid freeing GPU images and save some
* time by skipping mutex lock.
*/
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index caa50cd0ebf..fed90ad8982 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -660,7 +660,7 @@ void BKE_override_library_update(Main *bmain, ID *local)
* Actually, maybe not! Since we are swapping with original ID's local content, we want to
* keep user-count in correct state when freeing tmp_id
* (and that user-counts of IDs used by 'new' local data also remain correct). */
- /* This would imply change in handling of usercout all over RNA
+ /* This would imply change in handling of user-count all over RNA
* (and possibly all over Blender code).
* Not impossible to do, but would rather see first if extra useless usual user handling
* is actually a (performances) issue here. */
@@ -733,7 +733,7 @@ void BKE_main_override_library_update(Main *bmain)
* where we only define values that need differential data.
*
* This avoids us having to modify 'real' data-block at write time (and restoring it afterwards),
- * which is inneficient, and potentially dangerous (in case of concurrent access...), while not
+ * which is inefficient, and potentially dangerous (in case of concurrent access...), while not
* using much extra memory in typical cases. It also ensures stored data-block always contains
* exact same data as "desired" ones (kind of "baked" data-blocks).
*/
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 934544b3173..8fe2552c03f 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -484,7 +484,7 @@ static void libblock_remap_data(
FOREACH_MAIN_ID_END;
}
- /* XXX We may not want to always 'transfer' fakeuser from old to new id...
+ /* XXX We may not want to always 'transfer' fake-user from old to new id...
* Think for now it's desired behavior though,
* we can always add an option (flag) to control this later if needed. */
if (old_id && (old_id->flag & LIB_FAKEUSER)) {
diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c
index 34f0eeaab7b..cb042e087d5 100644
--- a/source/blender/blenkernel/intern/subdiv_eval.c
+++ b/source/blender/blenkernel/intern/subdiv_eval.c
@@ -104,11 +104,10 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv,
for (int face_index = 0; face_index < num_faces; ++face_index) {
const int num_face_vertices = topology_refiner->getNumFaceVertices(topology_refiner,
face_index);
- const int *uv_indicies = topology_refiner->getFaceFVarValueIndices(
+ const int *uv_indices = topology_refiner->getFaceFVarValueIndices(
topology_refiner, face_index, layer_index);
for (int vertex_index = 0; vertex_index < num_face_vertices; vertex_index++, mluv++) {
- evaluator->setFaceVaryingData(
- evaluator, layer_index, mluv->uv, uv_indicies[vertex_index], 1);
+ evaluator->setFaceVaryingData(evaluator, layer_index, mluv->uv, uv_indices[vertex_index], 1);
}
}
}
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 387d4ec5773..dd2b182474e 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -118,7 +118,7 @@ static void *workspace_relation_get_data_matching_parent(const ListBase *relatio
* Checks if \a screen is already used within any workspace. A screen should never be assigned to
* multiple WorkSpaceLayouts, but that should be ensured outside of the BKE_workspace module
* and without such checks.
- * Hence, this should only be used as assert check before assigining a screen to a workspace.
+ * Hence, this should only be used as assert check before assigning a screen to a workspace.
*/
#ifndef NDEBUG
static bool workspaces_is_screen_used