forked from bartvdbraak/blender
Cleanup: spelling
This commit is contained in:
parent
0c3500e068
commit
b9eac0bb44
@ -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)
|
||||
|
@ -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)) {
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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++) {
|
||||
|
@ -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/restored. */
|
||||
if (!ELEM(sa->spacetype, SPACE_FILE, SPACE_TOPBAR)) {
|
||||
uiItemS(layout);
|
||||
|
||||
|
@ -924,8 +924,8 @@ static bool project_bucket_point_occluded(
|
||||
return false;
|
||||
}
|
||||
|
||||
/* basic line intersection, could move to math_geom.c, 2 points with a horiz line
|
||||
* 1 for an intersection, 2 if the first point is aligned, 3 if the second point is aligned */
|
||||
/* Basic line intersection, could move to math_geom.c, 2 points with a horizontal line
|
||||
* 1 for an intersection, 2 if the first point is aligned, 3 if the second point is aligned. */
|
||||
#define ISECT_TRUE 1
|
||||
#define ISECT_TRUE_P1 2
|
||||
#define ISECT_TRUE_P2 3
|
||||
@ -2443,8 +2443,8 @@ static void project_bucket_clip_face(
|
||||
*tot = 3;
|
||||
return;
|
||||
}
|
||||
/* handle pathological case here,
|
||||
* no need for further intersections below since tringle area is almost zero */
|
||||
/* Handle pathological case here,
|
||||
* no need for further intersections below since triangle area is almost zero. */
|
||||
if (collinear) {
|
||||
int flag;
|
||||
|
||||
|
@ -224,8 +224,8 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even
|
||||
vgroup_weight = BKE_defvert_multipaint_collective_weight(
|
||||
&me->dvert[v_idx_best], defbase_tot, defbase_sel, defbase_tot_sel, ts->auto_normalize);
|
||||
|
||||
/* if autonormalize is enabled, but weights are not normalized,
|
||||
* the value can exceed 1 */
|
||||
/* If auto-normalize is enabled, but weights are not normalized,
|
||||
* the value can exceed 1. */
|
||||
CLAMP(vgroup_weight, 0.0f, 1.0f);
|
||||
}
|
||||
|
||||
|
@ -1599,7 +1599,7 @@ static void bmesh_neighbor_average(float avg[3], BMVert *v)
|
||||
}
|
||||
|
||||
/* For bmesh: average only the four most aligned (parallel and perpendicular) edges
|
||||
* relative to a direction. Naturally converges to a quad-like tesselation. */
|
||||
* relative to a direction. Naturally converges to a quad-like tessellation. */
|
||||
static void bmesh_four_neighbor_average(float avg[3], float direction[3], BMVert *v)
|
||||
{
|
||||
/* Logic for 3 or more is identical. */
|
||||
|
@ -360,7 +360,7 @@ static void nla_panel_properties(const bContext *C, Panel *pa)
|
||||
row = uiLayoutRow(layout, true);
|
||||
uiItemR(row, &strip_ptr, "blend_type", 0, NULL, ICON_NONE);
|
||||
|
||||
/* blend in/out + autoblending
|
||||
/* Blend in/out + auto-blending:
|
||||
* - blend in/out can only be set when autoblending is off
|
||||
*/
|
||||
column = uiLayoutColumn(layout, true);
|
||||
|
@ -1269,8 +1269,8 @@ static void nlaedit_split_strip_actclip(Main *bmain, AnimData *adt, NlaTrack *nl
|
||||
nstrip = BKE_nlastrip_copy(bmain, strip, true, 0);
|
||||
BLI_insertlinkafter(&nlt->strips, strip, nstrip);
|
||||
|
||||
/* set the endpoint of the first strip and the start of the new strip
|
||||
* to the splitframe values calculated above
|
||||
/* Set the endpoint of the first strip and the start of the new strip
|
||||
* to the split-frame values calculated above.
|
||||
*/
|
||||
strip->end = splitframe;
|
||||
nstrip->start = splitframe;
|
||||
|
@ -2455,7 +2455,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op)
|
||||
Sequence *seq_next;
|
||||
|
||||
/* remove seq so overlap tests don't conflict,
|
||||
* see seq_free_sequence below for the real free'ing */
|
||||
* see seq_free_sequence below for the real freeing. */
|
||||
BLI_remlink(ed->seqbasep, seq);
|
||||
/* if (seq->ipo) id_us_min(&seq->ipo->id); */
|
||||
/* XXX, remove fcurve and assign to split image strips */
|
||||
@ -2584,8 +2584,8 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
BKE_sequence_calc(scene, seq);
|
||||
}
|
||||
|
||||
/* 2.73+, keeping endpoings is important!
|
||||
* moving them around means you can't usefully use metas in a complex edit */
|
||||
/* 2.73+, keeping endpoints is important!
|
||||
* moving them around means you can't usefully use metas in a complex edit. */
|
||||
#if 1
|
||||
BKE_sequence_tx_set_final_left(ms->parseq, ms->disp_range[0]);
|
||||
BKE_sequence_tx_set_final_right(ms->parseq, ms->disp_range[1]);
|
||||
@ -3354,7 +3354,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
/* Replace datablock pointers with copies, to keep things working in case
|
||||
* datablocks get deleted or another .blend file is openeded. */
|
||||
* datablocks get deleted or another .blend file is opened. */
|
||||
BKE_sequencer_base_clipboard_pointers_store(bmain, &seqbase_clipboard);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
|
@ -654,7 +654,7 @@ static void view3d_draw_bgpic(Scene *scene, Depsgraph *depsgraph,
|
||||
float zoomx = (x2 - x1) / ibuf->x;
|
||||
float zoomy = (y2 - y1) / ibuf->y;
|
||||
|
||||
/* for some reason; zoomlevels down refuses to use GL_ALPHA_SCALE */
|
||||
/* For some reason; zoom-levels down refuses to use GL_ALPHA_SCALE. */
|
||||
if (zoomx < 1.0f || zoomy < 1.0f) {
|
||||
float tzoom = min_ff(zoomx, zoomy);
|
||||
int mip = 0;
|
||||
|
@ -2035,7 +2035,7 @@ static void drawTransformPixel(const struct bContext *C, ARegion *ar, void *arg)
|
||||
ViewLayer *view_layer = t->view_layer;
|
||||
Object *ob = OBACT(view_layer);
|
||||
|
||||
/* draw autokeyframing hint in the corner
|
||||
/* draw auto-key-framing hint in the corner
|
||||
* - only draw if enabled (advanced users may be distracted/annoyed),
|
||||
* for objects that will be autokeyframed (no point otherwise),
|
||||
* AND only for the active region (as showing all is too overwhelming)
|
||||
|
@ -1005,7 +1005,7 @@ static void setNearestAxis3d(TransInfo *t)
|
||||
mvec[1] = (float)(t->mval[1] - t->con.imval[1]);
|
||||
mvec[2] = 0.0f;
|
||||
|
||||
/* we need to correct axis length for the current zoomlevel of view,
|
||||
/* We need to correct axis length for the current zoom-level of view,
|
||||
* this to prevent projected values to be clipped behind the camera
|
||||
* and to overflow the short integers.
|
||||
* The formula used is a bit stupid, just a simplification of the subtraction
|
||||
|
@ -945,7 +945,7 @@ static void recalcData_objects(TransInfo *t)
|
||||
|
||||
/* if animtimer is running, and the object already has animation data,
|
||||
* check if the auto-record feature means that we should record 'samples'
|
||||
* (i.e. uneditable animation values)
|
||||
* (i.e. un-editable animation values)
|
||||
*
|
||||
* context is needed for keying set poll() functions.
|
||||
*/
|
||||
|
@ -96,7 +96,7 @@ void GPU_framebuffer_texture_detach_slot(
|
||||
* })
|
||||
* \encode
|
||||
*
|
||||
* \note Unspecified attachements (i.e: those beyond the last
|
||||
* \note Unspecified attachments (i.e: those beyond the last
|
||||
* GPU_ATTACHMENT_* in GPU_framebuffer_ensure_config list) are left unchanged.
|
||||
*
|
||||
* \note Make sure that the dimensions of your textures matches
|
||||
|
@ -40,7 +40,7 @@
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
/**
|
||||
* Empty function, use for breakpoint when a depreacated
|
||||
* Empty function, use for breakpoint when a deprecated
|
||||
* OpenGL function is called.
|
||||
*/
|
||||
static void gl_deprecated(void)
|
||||
|
@ -144,7 +144,7 @@ void immRecti_complete(int x1, int y1, int x2, int y2, const float color[4])
|
||||
* Pack color into 3 bytes
|
||||
*
|
||||
* This define converts a numerical value to the equivalent 24-bit
|
||||
* color, while not being endian-sensitive. On little-endians, this
|
||||
* color, while not being endian-sensitive. On little-endian, this
|
||||
* is the same as doing a 'naive' indexing, on big-endian, it is not!
|
||||
*
|
||||
* \note BGR format (i.e. 0xBBGGRR)...
|
||||
|
Loading…
Reference in New Issue
Block a user