Cleanup: Grammar in comments: Fix uses of "own"

"Own" (the adjective) cannot be used on its own. It should be combined
with something like "its own", "our own",  "her own", or "the object's own".
It also isn't used separately to mean something like "separate".

Also, "its own" is correct instead of "it's own" which is a misues of the verb.
This commit is contained in:
Hans Goudey
2024-03-07 16:20:36 -05:00
parent 8b014b34aa
commit 744f3b2823
107 changed files with 102 additions and 133 deletions
+1 -1
View File
@@ -117,7 +117,7 @@ endif()
# Embree needs to be included after dpcpp as it uses it for compiling with GPU support
if(BLENDER_PLATFORM_WINDOWS_ARM)
# WoA needs embree to be built with the VS Generator + LLVM,
# put it in it's own file to avoid clutter.
# put it in its own file to avoid clutter.
include(cmake/embree_windows_arm.cmake)
else()
include(cmake/embree.cmake)
+1 -1
View File
@@ -950,7 +950,7 @@ char *BLF_display_name_from_file(const char *filepath)
{
/* While listing font directories this function can be called simultaneously from a greater
* number of threads than we want the FreeType cache to keep open at a time. Therefore open
* with own FT_Library object and use FreeType calls directly to avoid any contention. */
* with a separate FT_Library object and use FreeType calls directly to avoid any contention. */
char *name = nullptr;
FT_Library ft_library;
if (FT_Init_FreeType(&ft_library) == FT_Err_Ok) {
+1 -1
View File
@@ -62,7 +62,7 @@ struct ClothSolverResult {
*
* The m and n members of this structure represent the assumed
* rectangular ordered grid for which the original paper is written.
* At some point they need to disappear and we need to determine out
* At some point they need to disappear and we need to determine our
* own connectivity of the mesh based on the actual edges in the mesh.
*/
struct Cloth {
+2 -2
View File
@@ -432,11 +432,11 @@ void BKE_nlastrip_validate_name(struct AnimData *adt, struct NlaStrip *strip);
/* ............ */
/**
* Check if the given NLA-Track has any strips with own F-Curves.
* Check if the given NLA-Track has any strips with their own F-Curves.
*/
bool BKE_nlatrack_has_animated_strips(struct NlaTrack *nlt);
/**
* Check if given NLA-Tracks have any strips with own F-Curves.
* Check if given NLA-Tracks have any strips with their own F-Curves.
*/
bool BKE_nlatracks_have_animated_strips(ListBase *tracks);
/**
+1 -1
View File
@@ -336,7 +336,7 @@ void BKE_object_where_is_calc_time(Depsgraph *depsgraph, Scene *scene, Object *o
*/
void BKE_object_where_is_calc_mat4(Object *ob, float r_obmat[4][4]);
/* Possibly belong in own module? */
/* Possibly belong in its own module? */
void BKE_boundbox_init_from_minmax(BoundBox *bb, const float min[3], const float max[3]);
void BKE_boundbox_minmax(const BoundBox *bb,
+1 -1
View File
@@ -225,7 +225,7 @@ struct ARegionType {
/* register operator types on startup */
void (*operatortypes)();
/* add own items to keymap */
/* add items to keymap */
void (*keymap)(wmKeyConfig *keyconf);
/* allows default cursor per region */
void (*cursor)(wmWindow *win, ScrArea *area, ARegion *region);
+2 -2
View File
@@ -282,7 +282,7 @@ static bool rule_avoid_collision(BoidRule *rule,
}
}
/* Check boids in own system. */
/* Check boids in their own system. */
if (acbr->options & BRULE_ACOLL_WITH_BOIDS) {
neighbors = BLI_kdtree_3d_range_search_with_len_squared_cb(bbd->sim->psys->tree,
pa->prev_state.co,
@@ -690,7 +690,7 @@ static bool rule_fight(BoidRule *rule, BoidBrainData *bbd, BoidValues *val, Part
int n;
bool ret = false;
/* calculate own group strength */
/* calculate its own group strength */
int neighbors = BLI_kdtree_3d_range_search(
bbd->sim->psys->tree, pa->prev_state.co, &ptn, fbr->distance);
for (n = 0; n < neighbors; n++) {
+1 -1
View File
@@ -78,7 +78,7 @@ static void camera_copy_data(Main * /*bmain*/,
Camera *cam_dst = (Camera *)id_dst;
const Camera *cam_src = (const Camera *)id_src;
/* We never handle user-count here for own data. */
/* We never handle user-count here for owned data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
BLI_listbase_clear(&cam_dst->bg_images);
+2 -2
View File
@@ -2153,7 +2153,7 @@ void do_versions_ipos_to_animato(Main *bmain)
if (ob->pose) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) {
/* if constraint has own IPO, convert add these to Object
/* if constraint has its own IPO, convert add these to Object
* (NOTE: they're most likely to be drivers too)
*/
if (con->ipo) {
@@ -2173,7 +2173,7 @@ void do_versions_ipos_to_animato(Main *bmain)
/* check constraints for local IPO's */
LISTBASE_FOREACH (bConstraint *, con, &ob->constraints) {
/* if constraint has own IPO, convert add these to Object
/* if constraint has its own IPO, convert add these to Object
* (NOTE: they're most likely to be drivers too)
*/
if (con->ipo) {
+1 -1
View File
@@ -685,7 +685,7 @@ ID *BKE_id_copy_in_lib(Main *bmain,
BKE_library_foreach_ID_link(bmain, newid, id_copy_libmanagement_cb, &data, IDWALK_NOP);
/* Do not make new copy local in case we are copying outside of main...
* XXX TODO: is this behavior OK, or should we need own flag to control that? */
* XXX TODO: is this behavior OK, or should we need a separate flag to control that? */
if ((flag & LIB_ID_CREATE_NO_MAIN) == 0) {
BLI_assert(!owner_library || newid->lib == *owner_library);
if (!ID_IS_LINKED(newid)) {
+1 -1
View File
@@ -1509,7 +1509,7 @@ void BKE_mask_parent_init(MaskParent *parent)
parent->id_type = ID_MC;
}
/* *** own animation/shape-key implementation ***
/* *** animation/shape-key implementation ***
* BKE_mask_layer_shape_XXX */
int BKE_mask_layer_shape_totvert(MaskLayer *masklay)
@@ -91,7 +91,7 @@ static void movie_clip_copy_data(Main * /*bmain*/,
MovieClip *movie_clip_dst = (MovieClip *)id_dst;
const MovieClip *movie_clip_src = (const MovieClip *)id_src;
/* We never handle user-count here for own data. */
/* We never handle user-count here for owned data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
movie_clip_dst->anim = nullptr;
@@ -758,7 +758,7 @@ void multires_reshape_object_grids_to_tangent_displacement(
* \{ */
/* TODO(sergey): Make foreach_grid_coordinate more accessible and move this functionality to
* own file. */
* its own file. */
static void assign_final_coords_from_mdisps(const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
+1 -1
View File
@@ -160,7 +160,7 @@ static void ntree_copy_data(Main * /*bmain*/,
bNodeTree *ntree_dst = reinterpret_cast<bNodeTree *>(id_dst);
const bNodeTree *ntree_src = reinterpret_cast<const bNodeTree *>(id_src);
/* We never handle user-count here for own data. */
/* We never handle user-count here for owned data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
ntree_dst->runtime = MEM_new<bNodeTreeRuntime>(__func__);
@@ -504,7 +504,7 @@ BLI_INLINE float area_element(float x, float y)
static float brdf_approx(float spec_color, float roughness, float NV)
{
/* Very rough own approx. We don't need it to be correct, just fast.
/* Very rough approximation. We don't need it to be correct, just fast.
* Just simulate fresnel effect with roughness attenuation. */
float fresnel = exp2(-8.35f * NV) * (1.0f - roughness);
return spec_color * (1.0f - fresnel) + fresnel;
@@ -425,7 +425,7 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx,
return false;
}
/* move free edges into own list */
/* move free edges into their own list */
{
ScanFillEdge *eed;
ScanFillEdge *eed_next;
@@ -438,7 +438,7 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx,
}
}
/* move free vertices into own list */
/* move free vertices into their own list */
{
ScanFillEdge *eed;
ScanFillVert *eve;
+1 -1
View File
@@ -2086,7 +2086,7 @@ static double bm_mesh_calc_volume_face(const BMFace *f)
}
double BM_mesh_calc_volume(BMesh *bm, bool is_signed)
{
/* warning, calls own tessellation function, may be slow */
/* warning, calls its own tessellation function, may be slow */
double vol = 0.0;
BMFace *f;
BMIter fiter;
@@ -1504,7 +1504,7 @@ void DepsgraphRelationBuilder::build_constraints(ID *id,
/* Standard object relation. */
/* TODO: loc vs rot vs scale? */
if (&ct->tar->id == id) {
/* Constraint targeting own object:
/* Constraint targeting its own object:
* - This case is fine IF we're dealing with a bone
* constraint pointing to its own armature. In that
* case, it's just transform -> bone.
@@ -1686,7 +1686,7 @@ void DepsgraphRelationBuilder::build_animdata_drivers(ID *id)
/* create the driver's relations to targets */
build_driver(id, fcu);
/* prevent driver from occurring before own animation... */
/* prevent driver from occurring before its own animation... */
if (adt->action || adt->nla_tracks.first) {
add_relation(adt_key, driver_key, "AnimData Before Drivers");
}
@@ -457,7 +457,7 @@ static void deg_debug_graphviz_node_relations(DotExportContext &ctx, const Node
deg_debug_graphviz_relation_arrowhead(rel, edge);
edge.attributes.set("penwidth", penwidth);
/* NOTE: edge from node to own cluster is not possible and gives graphviz
/* NOTE: edge from node to our own cluster is not possible and gives graphviz
* warning, avoid this here by just linking directly to the invisible
* placeholder node. */
dot::Cluster *tail_cluster = ctx.clusters_map.lookup_default(tail, nullptr);
+1 -1
View File
@@ -132,7 +132,7 @@ static void clear_id_nodes_conditional(Depsgraph::IDDepsNodes *id_nodes, const F
for (IDNode *id_node : *id_nodes) {
if (id_node->id_cow == nullptr) {
/* This means builder "stole" ownership of the evaluated
* datablock for her own dirty needs. */
* datablock for its own dirty needs. */
continue;
}
if (id_node->id_cow == id_node->id_orig) {
@@ -246,7 +246,7 @@ void EEVEE_shadows_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
sldata->shadow_fb = GPU_framebuffer_create("shadow_fb");
}
/* Gather all light own update bits. to avoid costly intersection check. */
/* Gather all the light's own update bits. to avoid costly intersection check. */
for (int j = 0; j < linfo->cube_len; j++) {
const EEVEE_Light *evli = linfo->light_data + linfo->shadow_cube_light_indices[j];
/* Setup shadow cube in UBO and tag for update if necessary. */
@@ -1359,7 +1359,7 @@ void ShadowModule::set_view(View &view, GPUTexture *depth_tx)
statistics_buf_.current().async_flush_to_host();
/* Isolate shadow update into own command buffer.
/* Isolate shadow update into its own command buffer.
* If parameter buffer exceeds limits, then other work will not be impacted. */
bool use_flush = (shadow_technique == ShadowTechnique::TILE_COPY) &&
(GPU_backend_get_type() == GPU_BACKEND_METAL);
@@ -1754,7 +1754,7 @@ static void draw_bone_degrees_of_freedom(const ArmatureDrawContext *ctx, const b
zero_v3(tmp[3]);
mul_m4_m4m4(posetrans, posetrans, tmp);
}
/* ... but own rest-space. */
/* ... but its own rest-space. */
mul_m4_m4m3(posetrans, posetrans, pchan->bone->bone_mat);
float scale = pchan->bone->length * pchan->size[1];
@@ -158,7 +158,7 @@ struct SelectMap {
#endif
}
/** IMPORTANT: Changes the draw state. Need to be called after the pass own state_set. */
/** IMPORTANT: Changes the draw state. Need to be called after the pass's own state_set. */
void select_bind(PassSimple &pass)
{
if (selection_type == SelectionType::DISABLED) {
@@ -173,7 +173,7 @@ struct SelectMap {
pass.bind_ssbo(SELECT_ID_OUT, &select_output_buf);
}
/** IMPORTANT: Changes the draw state. Need to be called after the pass own state_set. */
/** IMPORTANT: Changes the draw state. Need to be called after the pass's own state_set. */
void select_bind(PassMain &pass)
{
if (selection_type == SelectionType::DISABLED) {
@@ -10,7 +10,7 @@ vec4 fast_rcp(vec4 v)
vec3 brdf_approx(vec3 spec_color, float roughness, float NV)
{
/* Very rough own approx. We don't need it to be correct, just fast.
/* Very rough approximation. We don't need it to be correct, just fast.
* Just simulate fresnel effect with roughness attenuation. */
float fresnel = exp2(-8.35 * NV) * (1.0 - roughness);
return mix(spec_color, vec3(1.0), fresnel);
@@ -1314,7 +1314,7 @@ static bool object_frame_has_keyframe(Object *ob, float frame)
return false;
}
/* check own animation data - specifically, the action it contains */
/* check its own animation data - specifically, the action it contains */
if ((ob->adt) && (ob->adt->action)) {
/* #41525 - When the active action is a NLA strip being edited,
* we need to correct the frame number to "look inside" the
@@ -13,7 +13,7 @@
#include "WM_types.hh"
/* only for own init/exit calls (wm_gizmotype_init/wm_gizmotype_free) */
/* only for separate init/exit calls (wm_gizmotype_init/wm_gizmotype_free) */
/* own includes */
#include "gizmo_library_intern.h"
@@ -10,7 +10,7 @@
* 3D Gizmo
*
* \brief Circle shaped gizmo for circular interaction.
* Currently no own handling, use with operator only.
* Currently no separate handling, use with operator only.
*
* - `matrix[0]` is derived from Y and Z.
* - `matrix[1]` is 'up' when DialGizmo.use_start_y_axis is set.
@@ -10,7 +10,7 @@
* 3D Gizmo
*
* \brief Gizmo with primitive drawing type (plane, cube, etc.).
* Currently only plane primitive supported without own handling, use with operator only.
* Currently only plane primitive supported without its own handling, use with operator only.
*/
#include "MEM_guardedalloc.h"
@@ -56,7 +56,7 @@ struct FileAttributeColumn {
};
struct FileLayout {
/* view settings - XXX: move into own struct. */
/* view settings - XXX: move into its own struct. */
int offset_top;
/* Height of the header for the different FileAttributeColumn's. */
int attribute_column_header_h;
@@ -39,7 +39,7 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
GPUOffScreen *ofs,
GPUViewport *viewport);
/**
* Creates own fake 3d views (wrapping #ED_view3d_draw_offscreen). Similar too
* Creates separate fake 3d views (wrapping #ED_view3d_draw_offscreen). Similar too
* #ED_view_draw_offscreen_imbuf_simple, but takes view/projection matrices as arguments.
*/
void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
@@ -87,7 +87,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph,
GPUViewport *viewport,
char err_out[256]);
/**
* Creates own fake 3d views (wrapping #ED_view3d_draw_offscreen_imbuf)
* Creates separate fake 3d views (wrapping #ED_view3d_draw_offscreen_imbuf)
*
* \param ofs: Optional off-screen buffer can be NULL.
* (avoids re-creating when doing multiple GL renders).
@@ -53,7 +53,7 @@ class AbstractView {
bool is_reconstructed_ = false;
/**
* Only one item can be renamed at a time. So rather than giving each item an own rename buffer
* Only one item can be renamed at a time. So rather than giving each item its own rename buffer
* (which just adds unused memory in most cases), have one here that is managed by the view.
*
* This fixed-size buffer is needed because that's what the rename button requires. In future we
@@ -763,7 +763,7 @@ uiLayout *UI_pie_menu_layout(uiPieMenu *pie);
/* Popup Blocks
*
* Functions used to create popup blocks. These are like popup menus
* but allow using all button types and creating an own layout. */
* but allow using all button types and creating their own layout. */
using uiBlockCreateFunc = uiBlock *(*)(bContext *C, ARegion *region, void *arg1);
using uiBlockCancelFunc = void (*)(bContext *C, void *arg1);
@@ -724,7 +724,7 @@ bool ui_but_rna_equals_ex(const uiBut *but,
static bool ui_but_equals_old(const uiBut *but, const uiBut *oldbut)
{
if (but->identity_cmp_func) {
/* If the buttons have own identity comparator callbacks (and they match), use this to
/* If the buttons have their own identity comparator callbacks (and they match), use this to
* determine equality. */
if (but->identity_cmp_func && (but->type == oldbut->type) &&
(but->identity_cmp_func == oldbut->identity_cmp_func))
@@ -355,7 +355,7 @@ struct uiButSearch : public uiBut {
/**
* Derived struct for #UI_BTYPE_DECORATOR
* Decorators have own RNA data, using the normal #uiBut RNA members has many side-effects.
* Decorators have their own RNA data, using the normal #uiBut RNA members has many side-effects.
*/
struct uiButDecorator : public uiBut {
struct PointerRNA decorated_rnapoin = {};
@@ -3151,7 +3151,7 @@ void uiItemDecoratorR_prop(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop,
UI_but_func_set(but, ui_but_anim_decorate_cb, but, nullptr);
but->flag |= UI_BUT_UNDO | UI_BUT_DRAG_LOCK;
/* Decorators have own RNA data, using the normal #uiBut RNA members has many side-effects. */
/* Decorators have their own RNA data, using the normal #uiBut RNA members has many side-effects. */
but->decorated_rnapoin = *ptr;
but->decorated_rnaprop = prop;
/* ui_def_but_rna() sets non-array buttons to have a RNA index of 0. */
@@ -3035,7 +3035,7 @@ static void constraint_ops_extra_draw(bContext *C, uiLayout *layout, void *con_v
static void draw_constraint_header(uiLayout *layout, Object *ob, bConstraint *con)
{
/* unless button has own callback, it adds this callback to button */
/* unless button has its own callback, it adds this callback to button */
uiBlock *block = uiLayoutGetBlock(layout);
UI_block_func_set(block, constraint_active_func, ob, con);
@@ -380,7 +380,7 @@ static bool add_collection_search_item(CollItemSearch &cis,
uiSearchItems *items)
{
/* If no item has an own icon to display, libraries can use the library icons rather than the
/* If no item has its own icon to display, libraries can use the library icons rather than the
* name prefix for showing the library status. */
int name_prefix_offset = cis.name_prefix_offset;
if (!has_id_icon && cis.is_id && !requires_exact_data_name) {
@@ -3442,8 +3442,8 @@ static const EnumPropertyItem *merge_type_itemf(bContext *C,
/* Only active object supported:
* In practice it doesn't make sense to run this operation on non-active meshes
* since selecting will activate - we could have own code-path for these but it's a hassle
* for now just apply to the active (first) object. */
* since selecting will activate - we could have a separate code-path for these but it's a
* hassle for now just apply to the active (first) object. */
if (em->selectmode & SCE_SELECT_VERTEX) {
if (em->bm->selected.first && em->bm->selected.last &&
((BMEditSelection *)em->bm->selected.first)->htype == BM_VERT &&
+1 -1
View File
@@ -147,7 +147,7 @@ static void join_mesh_single(Depsgraph *depsgraph,
/* For each shape-key in destination mesh:
* - if there's a matching one, copy it across
* (will need to transform vertices into new space...).
* - otherwise, just copy own coordinates of mesh
* - otherwise, just copy its own coordinates of mesh
* (no need to transform vertex coordinates into new space).
*/
if (key) {
@@ -177,7 +177,8 @@ void RIGIDBODY_OT_world_export(wmOperatorType *ot)
ot->idname = "RIGIDBODY_OT_world_export";
ot->name = "Export Rigid Body World";
ot->description =
"Export Rigid Body world to simulator's own fileformat (i.e. '.bullet' for Bullet Physics)";
"Export Rigid Body world to the simulator's own fileformat (i.e. '.bullet' for Bullet "
"Physics)";
/* callbacks */
ot->invoke = rigidbody_world_export_invoke;
@@ -1098,7 +1098,7 @@ static int min_distance_edit_modal(bContext *C, wmOperator *op, const wmEvent *e
auto finish = [&]() {
wmWindowManager *wm = CTX_wm_manager(C);
/* Remove own cursor. */
/* Remove cursor. */
WM_paint_cursor_end(static_cast<wmPaintCursor *>(op_data.cursor));
/* Restore original paint cursors. */
wm->paintcursors = op_data.orig_paintcursors;
@@ -5775,7 +5775,7 @@ void SCULPT_OT_brush_stroke(wmOperatorType *ot)
ot->cancel = sculpt_brush_stroke_cancel;
ot->ui = sculpt_redo_empty_ui;
/* Flags (sculpt does own undo? (ton)). */
/* Flags (sculpt does its own undo? (ton)). */
ot->flag = OPTYPE_BLOCKING;
/* Properties. */
@@ -657,7 +657,7 @@ static void clip_main_region_init(wmWindowManager *wm, ARegion *region)
wmKeyMap *keymap;
/* NOTE: don't use `UI_view2d_region_reinit(&region->v2d, ...)`
* since the space clip manages own v2d in #movieclip_main_area_set_view2d */
* since the space clip manages its own v2d in #movieclip_main_area_set_view2d */
/* mask polls mode */
keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW);
@@ -105,7 +105,7 @@ static int outliner_highlight_update_invoke(bContext *C, wmOperator * /*op*/, co
return OPERATOR_PASS_THROUGH;
}
/* Drag and drop does own highlighting. */
/* Drag and drop does its own highlighting. */
wmWindowManager *wm = CTX_wm_manager(C);
if (wm->drags.first) {
return OPERATOR_PASS_THROUGH;
@@ -81,7 +81,7 @@ namespace blender::ed::outliner {
/**
* \note changes to selection are by convention and not essential.
*
* \note Handles own undo push.
* \note Handles its own undo push.
*/
static void do_outliner_item_editmode_toggle(bContext *C, Scene *scene, Base *base)
{
@@ -114,7 +114,7 @@ static void do_outliner_item_editmode_toggle(bContext *C, Scene *scene, Base *ba
/**
* \note changes to selection are by convention and not essential.
*
* \note Handles own undo push.
* \note Handles its own undo push.
*/
static void do_outliner_item_posemode_toggle(bContext *C, Scene *scene, Base *base)
{
@@ -158,7 +158,7 @@ static void do_outliner_item_posemode_toggle(bContext *C, Scene *scene, Base *ba
* If we didn't want to touch selection we could add an option to the operators
* not to do multi-object editing.
*
* \note Handles own undo push.
* \note Handles its own undo push.
*/
static void do_outliner_item_mode_toggle_generic(bContext *C, TreeViewContext *tvc, Base *base)
{
@@ -250,7 +250,7 @@ static void outliner_select_sync_to_edit_bone(const Scene *scene,
else if (!is_edit_bone_selected(selected_ebones, ebone)) {
/* Don't flush to parent bone tip, synced selection is iterating the whole tree so
* deselecting potential children with `ED_armature_ebone_select_set(ebone, false)`
* would leave own tip deselected. */
* would leave its own tip deselected. */
ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
}
}
@@ -190,7 +190,7 @@ static rctf label_rect_init(const SeqChannelDrawContext *context,
float margin_x = icon_width_get(context) * 0.65;
float width = max_ff(0.0f, context->v2d->cur.xmax / context->scale - used_width);
/* Text input has own margin. Prevent text jumping around and use as much space as possible. */
/* Text input has its own margin. Prevent text jumping around and use as much space as possible. */
if (channel_is_being_renamed(CTX_wm_space_seq(context->C), channel_index)) {
float input_box_margin = icon_width_get(context) * 0.5f;
margin_x -= input_box_margin;
@@ -435,7 +435,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
}
td->ext->rotOrder = pchan->rotmode;
/* proper way to get parent transform + own transform + constraints transform */
/* proper way to get parent transform + our own transform + constraints transform */
copy_m3_m4(omat, ob->object_to_world().ptr());
/* New code, using "generic" BKE_bone_parent_transform_calc_from_pchan(). */
@@ -486,7 +486,7 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
}
}
/* For `axismtx` we use bone's own transform. */
/* For `axismtx` we use the bone's own transform. */
copy_m3_m4(pmat, pchan->pose_mat);
mul_m3_m3m3(td->axismtx, omat, pmat);
normalize_m3(td->axismtx);
+1 -1
View File
@@ -1120,7 +1120,7 @@ static ImBuf *ffmpeg_fetchibuf(ImBufAnim *anim, int position, IMB_Timecode_Type
* in FFmpeg 4.3.1. It got fixed later on, but for compatibility reasons is
* still best to avoid crash.
*
* This is achieved by using own allocation call rather than relying on
* This is achieved by using a separate allocation call rather than relying on
* IMB_allocImBuf() to do so since the IMB_allocImBuf() is not guaranteed
* to perform aligned allocation.
*
+1 -1
View File
@@ -215,7 +215,7 @@ void IMB_ffmpeg_init()
av_log_set_level(AV_LOG_DEBUG);
}
/* set own callback which could store last error to report to UI */
/* set separate callback which could store last error to report to UI */
av_log_set_callback(ffmpeg_log_callback);
}
@@ -10,7 +10,6 @@
#include <math.h>
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
+1 -1
View File
@@ -29,7 +29,7 @@ struct BoneCollection;
/* this system works on different transformation space levels;
*
* 1) Bone Space; with each Bone having own (0,0,0) origin
* 1) Bone Space; with each Bone having its own (0,0,0) origin
* 2) Armature Space; the rest position, in Object space, Bones Spaces are applied hierarchical
* 3) Pose Space; the animation position, in Object space
* 4) World Space; Object matrix applied to Pose or Armature space
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -10,7 +10,6 @@
#include "DNA_texture_defaults.h"
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -1052,7 +1052,7 @@ typedef enum eTransformLimits_Flags2 {
LIMIT_TRANSFORM = (1 << 1),
} eTransformLimits_Flags2;
/* transform limiting constraints -> flag (own flags). */
/* transform limiting constraints -> flag. */
typedef enum eTransformLimits_Flags {
LIMIT_XMIN = (1 << 0),
LIMIT_XMAX = (1 << 1),
@@ -1062,7 +1062,7 @@ typedef enum eTransformLimits_Flags {
LIMIT_ZMAX = (1 << 5),
} eTransformLimits_Flags;
/* limit rotation constraint -> flag (own flags). */
/* limit rotation constraint -> flag. */
typedef enum eRotLimit_Flags {
LIMIT_XROT = (1 << 0),
LIMIT_YROT = (1 << 1),
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -10,7 +10,6 @@
/* Note that some struct members for color-mapping and color-bands are not initialized here. */
/* Struct members on own line. */
/* clang-format off */
#define _DNA_DEFAULT_ArmatureGpencilModifierData \
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
#define _DNA_DEFAULT_ArmatureModifierData \
@@ -800,7 +799,7 @@
.flag = MOD_WIREFRAME_REPLACE | MOD_WIREFRAME_OFS_EVEN, \
.mat_ofs = 0, \
}
#define _DNA_DEFAULT_GreasePencilOpacityModifierData \
{ \
.color_mode = MOD_GREASE_PENCIL_COLOR_BOTH, \
@@ -812,7 +811,7 @@
{ \
.level = 1, \
}
#define _DNA_DEFAULT_GreasePencilColorModifierData \
{ \
.color_mode = MOD_GREASE_PENCIL_COLOR_BOTH, \
@@ -859,7 +858,7 @@
.step = 4, \
.seed = 1, \
}
#define _DNA_DEFAULT_GreasePencilMirrorModifierData \
{ \
.flag = MOD_GREASE_PENCIL_MIRROR_AXIS_X, \
@@ -895,7 +894,7 @@
.opacity = 1.0f, \
.mat_nr = -1, \
}
#define _DNA_DEFAULT_GreasePencilMultiModifierData \
{ \
.flag = 0, \
@@ -928,7 +927,7 @@
.flag = 0, \
.axis = 1, \
}
#define _DNA_DEFAULT_GreasePencilArrayModifierData \
{ \
.object = NULL, \
@@ -950,7 +949,7 @@
.dist_start = 0.0f, \
.dist_end = 20.0f, \
}
#define _DNA_DEFAULT_GreasePencilHookModifierData \
{ \
.object = NULL, \
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
+2 -2
View File
@@ -644,7 +644,7 @@ typedef struct bNestedNodeRef {
* The basis for a Node tree, all links and nodes reside internal here.
*
* Only re-usable node trees are in the library though,
* materials and textures allocate own tree struct.
* materials and textures allocate their own tree struct.
*/
typedef struct bNodeTree {
ID id;
@@ -661,7 +661,7 @@ typedef struct bNodeTree {
/** Grease pencil data. */
struct bGPdata *gpd;
/** Node tree stores own offset for consistent editor view. */
/** Node tree stores its own offset for consistent editor view. */
float view_center[2];
ListBase nodes, links;
@@ -10,7 +10,6 @@
#include "DNA_vec_defaults.h"
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -10,7 +10,6 @@
#include "DNA_view3d_defaults.h"
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -10,7 +10,6 @@
#include "DNA_asset_types.h"
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
@@ -61,7 +61,7 @@ typedef struct bToolRef {
/** #bToolKey (space-type, mode), used in 'WM_api.hh' */
short space_type;
/**
* Value depends on the 'space_type', object mode for 3D view, image editor has own mode too.
* Value depends on the 'space_type', object mode for 3D view, image editor has its own mode too.
* RNA needs to handle using item function.
*/
int mode;
@@ -8,7 +8,6 @@
#pragma once
/* Struct members on own line. */
/* clang-format off */
/* -------------------------------------------------------------------- */
+1 -1
View File
@@ -207,7 +207,7 @@ enum PropertyFlag {
/**
* This flag means when the property's widget is in 'text-edit' mode, it will be updated
* after every typed char, instead of waiting final validation. Used e.g. for text search-box.
* It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add an own flag
* It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add a separate flag
* for search/filter properties, but this works just fine for now.
*/
PROP_TEXTEDIT_UPDATE = (1u << 31),
@@ -195,7 +195,7 @@ unset(GENSRC_CXXFLAGS)
# NOTE: Disable clang-tidy because generated files are stored outside of the source,
# so the clang-tidy can not find our .clang-tidy and fall-backs to own set of rules
# so the clang-tidy can not find our .clang-tidy and fall-backs to its own set of rules
# which are too noisy for Blender.
#
# In the future clang-tidy would either need to be inlined checks and passed via the
@@ -531,7 +531,7 @@ struct StructRNA {
/* various options */
int flag;
/* Each StructRNA type can define own tags which properties can set
/* Each StructRNA type can define its own tags which properties can set
* (PropertyRNA.tags) for changed behavior based on struct-type. */
const EnumPropertyItem *prop_tag_defines;
+1 -1
View File
@@ -987,7 +987,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Use Custom Shading Nodes",
"Don't expose Cycles and EEVEE shading nodes in the node editor user "
"interface, so own nodes can be used instead");
"interface, so separate nodes can be used instead");
prop = RNA_def_property(srna, "bl_use_spherical_stereo", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "type->flag", RE_USE_SPHERICAL_STEREO);
+2 -2
View File
@@ -3566,7 +3566,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
"Snap to Same Target",
"Snap only to target that source was initially near (Face Nearest Only)");
/* node editor uses own set of snap modes */
/* node editor uses its own set of snap modes */
prop = RNA_def_property(srna, "snap_node_element", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "snap_node_mode");
RNA_def_property_flag(prop, PROP_DEG_SYNC_ONLY);
@@ -3596,7 +3596,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_UNIT);
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr); /* header redraw */
/* image editor uses own set of snap modes */
/* image editor uses its own set of snap modes */
prop = RNA_def_property(srna, "snap_uv_element", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "snap_uv_mode");
RNA_def_property_flag(prop, PROP_DEG_SYNC_ONLY);
+1 -1
View File
@@ -114,7 +114,7 @@ static void update_depsgraph(ModifierData *md, const ModifierUpdateDepsgraphCont
}
DEG_add_object_relation(ctx->node, hmd->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
}
/* We need own transformation as well. */
/* We need our own transformation as well. */
DEG_add_depends_on_transform_relation(ctx->node, "Hook Modifier");
}
@@ -148,7 +148,7 @@ static void update_depsgraph(ModifierData *md, const ModifierUpdateDepsgraphCont
DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_TRANSFORM, "Mesh Deform Modifier");
DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_GEOMETRY, "Mesh Deform Modifier");
}
/* We need own transformation as well. */
/* We need our own transformation as well. */
DEG_add_depends_on_transform_relation(ctx->node, "Mesh Deform Modifier");
}
@@ -63,7 +63,7 @@ static void generate_vert_coordinates(Mesh *mesh,
}
/* Get size (i.e. deformation of the spheroid generating normals),
* either from target object, or own geometry. */
* either from target object, or geometry. */
if (r_size != nullptr) {
if (ob_center != nullptr) {
/* Using 'scale' as 'size' here. The input object is typically an empty
@@ -62,7 +62,7 @@ static void update_depsgraph(ModifierData * /*md*/, const ModifierUpdateDepsgrap
DEG_add_forcefield_relations(
ctx->node, ctx->object, ctx->object->soft->effector_weights, true, 0, "Softbody Field");
}
/* We need own transformation as well. */
/* We need our own transformation as well. */
DEG_add_depends_on_transform_relation(ctx->node, "SoftBody Modifier");
}
@@ -210,7 +210,7 @@ void ntreeCompositTagRender(Scene *scene)
/* XXX Think using G_MAIN here is valid, since you want to update current file's scene nodes,
* not the ones in temp main generated for rendering?
* This is still rather weak though,
* ideally render struct would store own main AND original G_MAIN. */
* ideally render struct would store its own main AND original G_MAIN. */
for (Scene *sce_iter = (Scene *)G_MAIN->scenes.first; sce_iter;
sce_iter = (Scene *)sce_iter->id.next)
@@ -18,7 +18,7 @@
* comments: (ton)
*
* This system needs recode, a node system should rely on the stack, and
* callbacks for nodes only should evaluate own node, not recursively go
* callbacks for nodes only should evaluate their own node, not recursively go
* over other previous ones.
*/
+1 -1
View File
@@ -1097,7 +1097,7 @@ static void do_render_compositor_scene(Render *re, Scene *sce, int cfra)
BKE_scene_camera_switch_update(sce);
/* exception: scene uses own size (unfinished code) */
/* exception: scene uses its own size (unfinished code) */
if (false) {
BKE_render_resolution(&sce->r, false, &winx, &winy);
}
@@ -8,7 +8,7 @@
* \name Gizmo-Group
*
* Gizmo-groups store and manage groups of gizmos. They can be
* attached to modal handlers and have own keymaps.
* attached to modal handlers and have their own keymaps.
*/
#include <cstdlib>

Some files were not shown because too many files have changed in this diff Show More