diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/object | |
parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.c | 8 | ||||
-rw-r--r-- | source/blender/editors/object/object_constraint.c | 10 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_gpencil_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 6 | ||||
-rw-r--r-- | source/blender/editors/object/object_shader_fx.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index ae5a6912673..c6f9c1230a6 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1631,7 +1631,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, * still work out ok */ BKE_object_apply_mat4(ob_dst, dob->mat, false, true); - /* to set ob_dst->orig and in case theres any other discrepicies */ + /* to set ob_dst->orig and in case there's any other discrepancies */ DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB); } } @@ -1790,7 +1790,7 @@ static int convert_exec(bContext *C, wmOperator *op) { ob->flag &= ~OB_DONE; - /* flag data thats not been edited (only needed for !keep_original) */ + /* flag data that's not been edited (only needed for !keep_original) */ if (ob->data) { ((ID *)ob->data)->tag |= LIB_TAG_DOIT; } @@ -1819,7 +1819,7 @@ static int convert_exec(bContext *C, wmOperator *op) Base *base = link->ptr.data; Object *ob = base->object; - /* The way object type conversion works currently (enforcing conversion of *all* objetcs using converted + /* The way object type conversion works currently (enforcing conversion of *all* objects using converted * obdata, even some un-selected/hidden/inother scene ones, sounds totally bad to me. * However, changing this is more design than bugfix, not to mention convoluted code below, * so that will be for later. @@ -1909,7 +1909,7 @@ static int convert_exec(bContext *C, wmOperator *op) /* make new mesh data from the original copy */ /* note: get the mesh from the original, not from the copy in some - * cases this doesnt give correct results (when MDEF is used for eg) + * cases this doesn't give correct results (when MDEF is used for eg) */ dm = mesh_get_derived_final(depsgraph, scene, newob, CD_MASK_MESH); diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index d2a85de8fe1..fdb267c796e 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -501,7 +501,7 @@ static int constraint_type_get(Object *owner, bPoseChannel *pchan) } /* checks validity of object pointers, and NULLs, - * if Bone doesnt exist it sets the CONSTRAINT_DISABLE flag. + * if Bone doesn't exist it sets the CONSTRAINT_DISABLE flag. */ static void test_constraints(Main *bmain, Object *owner, bPoseChannel *pchan) { @@ -599,7 +599,7 @@ static bool edit_constraint_poll_generic(bContext *C, StructRNA *rna_type) } if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit constraints coming from static override"); return (((bConstraint *)ptr.data)->flag & CONSTRAINT_STATICOVERRIDE_LOCAL) != 0; } @@ -1764,7 +1764,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase return OPERATOR_CANCELLED; } - /* create a new constraint of the type requried, and add it to the active/given constraints list */ + /* create a new constraint of the type required, and add it to the active/given constraints list */ if (pchan) con = BKE_constraint_add_for_pose(ob, pchan, NULL, type); else @@ -1999,7 +1999,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED return OPERATOR_CANCELLED; } - /* prepare popup menu to choose targetting options */ + /* prepare popup menu to choose targeting options */ pup = UI_popup_menu_begin(C, IFACE_("Add IK"), ICON_NONE); layout = UI_popup_menu_layout(pup); @@ -2066,7 +2066,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op)) { bConstraint *con, *next; - /* TODO: should we be checking if these contraints were local before we try and remove them? */ + /* TODO: should we be checking if these constraints were local before we try and remove them? */ for (con = pchan->constraints.first; con; con = next) { next = con->next; if (con->type == CONSTRAINT_TYPE_KINEMATIC) { diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 43d287590e6..c893f106363 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1225,7 +1225,7 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot) */ void ED_objects_recalculate_paths(bContext *C, Scene *scene, bool current_frame_only) { - /* Transform doesn't always have context avaialble to do update. */ + /* Transform doesn't always have context available to do update. */ if (C == NULL) { return; } diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index e8b5bebef0d..cb46185a087 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -379,7 +379,7 @@ static int gpencil_edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from static override"); return (((GpencilModifierData *)ptr.data)->flag & eGpencilModifierFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 4b155642b0e..cfd50b0dba6 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -833,7 +833,7 @@ bool edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_fla if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit modifiers coming from static override"); return (((ModifierData *)ptr.data)->flag & eModifierFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 7934bcf2d15..5d9b6a2d13e 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2329,7 +2329,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) success = BKE_override_static_create_from_tag(bmain); - /* Intantiate our newly overridden objects in scene, if not yet done. */ + /* Instantiate our newly overridden objects in scene, if not yet done. */ Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); Collection *new_collection = (Collection *)collection->id.newid; @@ -2363,7 +2363,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) /* obcollection is no more duplicollection-ing, it merely parents whole collection of overriding instantiated objects. */ obcollection->dup_group = NULL; - /* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */ + /* Also, we'd likely want to lock by default things like transformations of implicitly overridden objects? */ DEG_id_tag_update(&scene->id, 0); @@ -2383,7 +2383,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) success = BKE_override_static_create_from_tag(bmain); - /* Also, we'd likely want to lock by default things like transformations of implicitly overriden objects? */ + /* Also, we'd likely want to lock by default things like transformations of implicitly overridden objects? */ /* Cleanup. */ BKE_main_id_clear_newpoins(bmain); diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index 62569676434..47cf9f6c20b 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -301,7 +301,7 @@ static bool edit_shaderfx_poll_generic(bContext *C, StructRNA *rna_type, int obt if (ptr.id.data && ID_IS_LINKED(ptr.id.data)) return 0; if (ID_IS_STATIC_OVERRIDE(ob)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit shaderfxs comming from static override"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit shaderfxs coming from static override"); return (((ShaderFxData *)ptr.data)->flag & eShaderFxFlag_StaticOverride_Local) != 0; } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 13166929090..81e074a7e8f 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -494,7 +494,7 @@ static void mesh_defvert_mirror_update_internal( const int def_nr) { if (def_nr == -1) { - /* all vgroups, add groups where neded */ + /* all vgroups, add groups where needed */ int flip_map_len; int *flip_map = defgroup_flip_map(ob, &flip_map_len, true); defvert_sync_mapped(dvert_dst, dvert_src, flip_map, flip_map_len, true); |