Commit: b9eac0bb44fbb4e8d16a74fab8e0d9bc37bfebd3
Author: Campbell Barton
Date: Wed Apr 10 08:40:49 2019 +0200
Branches: master
https://developer.blender.org/rBb9eac0bb44fbb4e8d16a74fab8e0d9bc37bfebd3
Cleanup: spelling
===================================================================
M intern/cycles/render/mesh.cpp
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_generics.c
M source/blender/gpu/GPU_framebuffer.h
M source/blender/gpu/GPU_legacy_stubs.h
M source/blender/gpu/intern/gpu_immediate_util.c
===================================================================
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 03dc21b91c9..eadbe3eda89 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -2125,7 +2125,7 @@ void MeshManager::device_update(Device *device,
DeviceScene *dscene, Scene *scen
mesh->add_undisplaced();
}
- /* Test if we need tesselation. */
+ /* Test if we need tessellation. */
if(mesh->subdivision_type != Mesh::SUBDIVISION_NONE &&
mesh->num_subd_verts == 0 &&
mesh->subd_params)
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 6c4049ec295..2c23f133952 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8171,7 +8171,7 @@ static void direct_link_library(FileData *fd, Library
*lib, Main *main)
/* Now, since Blender always expect **latest**
Main pointer from fd->mainlist to be the active library
* Main pointer, where to add all non-library
data-blocks found in file next, we have to switch that
* 'dupli' found Main to latest position in the
list!
- * Otherwise, you get weird disappearing linked
data on a rather unconsistant basis.
+ * Otherwise, you get weird disappearing linked
data on a rather inconsistent basis.
* See also T53977 for reproducible case. */
BLI_remlink(fd->mainlist, newmain);
BLI_addtail(fd->mainlist, newmain);
@@ -8930,7 +8930,7 @@ static BHead *read_libblock(FileData *fd, Main *main,
BHead *bhead, const int ta
/* In undo case, most libs and linked data should be kept as is from
previous state (see BLO_read_from_memfile).
* However, some needed by the snapshot being read may have been
removed in previous one, and would go missing.
- * This leads e.g. to desappearing objects in some undo/redo case, see
T34446.
+ * This leads e.g. to disappearing objects in some undo/redo case, see
T34446.
* That means we have to carefully check whether current lib or libdata
already exits in old main, if it does
* we merely copy it over into new main area, otherwise we have to do a
full read of that bhead... */
if (fd->memfile && ELEM(bhead->code, ID_LI, ID_LINK_PLACEHOLDER)) {
diff --git a/source/blender/editors/armature/pose_slide.c
b/source/blender/editors/armature/pose_slide.c
index 0474f8a97e6..e6ed26bdf71 100644
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -704,7 +704,7 @@ static void pose_slide_apply(bContext *C, tPoseSlideOp *pso)
pose_slide_refresh(C, pso);
}
-/* perform autokeyframing after changes were made + confirmed */
+/* perform auto-key-framing after changes were made + confirmed */
static void pose_slide_autoKeyframe(bContext *C, tPoseSlideOp *pso)
{
/* wrapper around the generic call */
diff --git a/source/blender/editors/armature/pose_utils.c
b/source/blender/editors/armature/pose_utils.c
index 75a3f13ee84..25ddcee52cf 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -277,7 +277,7 @@ void poseAnim_mapping_reset(ListBase *pfLinks)
}
}
-/* perform autokeyframing after changes were made + confirmed */
+/* perform auto-key-framing after changes were made + confirmed */
void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, ListBase
*pfLinks, float cframe)
{
ViewLayer *view_layer = CTX_data_view_layer(C);
@@ -303,7 +303,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene
*scene, ListBase *pfLinks,
return;
}
- /* insert keyframes as necessary if autokeyframing */
+ /* Insert keyframes as necessary if auto-key-framing. */
KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene,
ANIM_KS_WHOLE_CHARACTER_ID);
ListBase dsources = {NULL, NULL};
tPChanFCurveLink *pfl;
diff --git a/source/blender/editors/gpencil/annotate_draw.c
b/source/blender/editors/gpencil/annotate_draw.c
index 43e2b5bd3bf..2a7f9a715ad 100644
--- a/source/blender/editors/gpencil/annotate_draw.c
+++ b/source/blender/editors/gpencil/annotate_draw.c
@@ -1036,9 +1036,8 @@ void ED_annotation_draw_2dimage(const bContext *C)
}
if (ED_screen_animation_playing(wm)) {
- /* don't show onionskins during animation playback/scrub (i.e.
it obscures the poses)
- * OpenGL Renders (i.e. final output), or depth buffer (i.e.
not real strokes)
- */
+ /* Don't show onion-skins during animation playback/scrub (i.e.
it obscures the poses)
+ * OpenGL Renders (i.e. final output), or depth buffer (i.e.
not real strokes). */
dflag |= GP_DRAWDATA_NO_ONIONS;
}
diff --git a/source/blender/editors/gpencil/gpencil_brush.c
b/source/blender/editors/gpencil/gpencil_brush.c
index 580d09cefc0..e7e6d7a5f7f 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -811,7 +811,7 @@ static bool gp_brush_randomize_apply(
/* Jitter is applied perpendicular to the mouse movement vector
* - We compute all effects in screenspace (since it's easier)
* and then project these to get the points/distances in
- * viewspace as needed
+ * view-space as needed.
*/
float mvec[2], svec[2];
@@ -1029,8 +1029,8 @@ static void gp_brush_clone_init(bContext *C,
tGP_BrushEditData *gso)
data->new_strokes = MEM_callocN(sizeof(bGPDstroke *) *
data->totitems, "cloned strokes ptr array");
}
- /* Init colormap for mapping between the pasted stroke's source
colour(names)
- * and the final colours that will be used here instead...
+ /* Init colormap for mapping between the pasted stroke's source color
(names)
+ * and the final colours that will be used here instead.
*/
data->new_colors = gp_copybuf_validate_colormap(C);
}
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index 9f189b63ad5..4a3e0983989 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -172,21 +172,21 @@ enum {
/* but->flag - general state flags. */
enum {
- /** warning, the first 6 flags are internal. */
+ /** Warning, the first 6 flags are internal. */
UI_BUT_ICON_SUBMENU = 1 << 6,
UI_BUT_ICON_PREVIEW = 1 << 7,
UI_BUT_NODE_LINK = 1 << 8,
UI_BUT_NODE_ACTIVE = 1 << 9,
UI_BUT_DRAG_LOCK = 1 << 10,
- /** grayed out and uneditable */
+ /** Grayed out and un-editable. */
UI_BUT_DISABLED = 1 << 11,
UI_BUT_ANIMATED = 1 << 13,
UI_BUT_ANIMATED_KEY = 1 << 14,
UI_BUT_DRIVEN = 1 << 15,
UI_BUT_REDALERT = 1 << 16,
- /** grayed out but still editable */
+ /** Grayed out but still editable. */
UI_BUT_INACTIVE = 1 << 17,
UI_BUT_LAST_ACTIVE = 1 << 18,
UI_BUT_UNDO = 1 << 19,
diff --git a/source/blender/editors/physics/particle_edit.c
b/source/blender/editors/physics/particle_edit.c
index efc969a333e..bd78677bdb6 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -3965,7 +3965,7 @@ static int brush_add(const bContext *C, PEData *data,
short number)
}
BLI_assert(mesh);
- /* Calculate positions of new particles to add, based on brush
interseciton
+ /* Calculate positions of new particles to add, based on brush
intersection
* with object. New particle data is assigned to a corresponding to
check
* index element of add_pars array. This means, that add_pars is a
sparse
* array.
@@ -3993,7 +3993,7 @@ static int brush_add(const bContext *C, PEData *data,
short number)
BLI_task_parallel_range(0, number, &iter_data, brush_add_count_iter,
&settings);
/* Convert add_parse to a dense array, where all new particles are in
the
- * beginnign of the array.
+ * beginning of the array.
*/
n = iter_data.num_added;
for (int current_iter = 0, new_index = 0; current_iter < number;
current_iter++) {
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 09ca0476b10..cd2a610813e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -618,7 +618,7 @@ static ARegion *screen_find_region_type(bContext *C, int
type)
*
* functions:
*
- * apply() set actionzone event
+ * apply() set action-zone event
*
* exit() free customdata
*
@@ -826,7 +826,7 @@ static AZone *area_actionzone_refresh_xy(ScrArea *sa, const
int xy[2], const boo
return az;
}
-/* Finds an actionzone by position in entire screen so azones can overlap */
+/* Finds an action-zone by position in entire screen so azones can overlap. */
static AZone *screen_actionzone_find_xy(bScreen *sc, const int xy[2])
{
for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
@@ -904,7 +904,7 @@ static int actionzone_invoke(bContext *C, wmOperator *op,
const wmEvent *event)
if (az == NULL || ELEM(az->type, AZONE_REGION_SCROLL))
return OPERATOR_PASS_THROUGH;
- /* ok we do the actionzone */
+ /* ok we do the action-zone */
sad = op->customdata = MEM_callocN(sizeof(sActionzoneData),
"sActionzoneData");
sad->sa1 = screen_actionzone_area(sc, az);
sad->az = az;
@@ -1054,7 +1054,7 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot)
*
* functions:
*
- * init() set custom data for operator, based on actionzone event custom data
+ * init() set custom data for operator, based on action-zone event custom
data
*
* cancel() cancel the operator
*
@@ -1062,7 +1062,7 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot)
*
* callbacks:
*
- * invoke() gets called on shift+lmb drag in actionzone
+ * invoke() gets called on shift+lmb drag in action-zone
* call init(), add handler
*
* modal() accept modal events while doing it
@@ -3811,8 +3811,8 @@ void ED_screens_header_tools_menu_create(bContext *C,
uiLayout *layout, void *UN
(sa->flag & HEADER_NO_PULLDOWN) ? ICON_CHECKBOX_HLT :
ICON_CHECKBOX_DEHLT,
"SCREEN_OT_header_toggle_menus");
- /* file browser should be fullscreen all the time, topbar should
- * never be. But other regions can be maximized/restored... */
+ /* File browser should be fullscreen all the time, top-bar should
+ * never be. But other regions can be maximized/restore
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
