Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / object / object_add.c
index a760086abaeb3eb344afbc69dc21a7926430fdae..c481a62acb786498045df48b8a0d67954d31feac 100644 (file)
@@ -1860,8 +1860,8 @@ static int convert_exec(bContext *C, wmOperator *op)
                        Object *ob = base->object;
 
                        /* The way object type conversion works currently (enforcing conversion of *all* objects using converted
                        Object *ob = base->object;
 
                        /* 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,
+                        * object-data, even some un-selected/hidden/another scene ones, sounds totally bad to me.
+                        * However, changing this is more design than bug-fix, not to mention convoluted code below,
                         * so that will be for later.
                         * But at the very least, do not do that with linked IDs! */
                        if ((ID_IS_LINKED(ob) || (ob->data && ID_IS_LINKED(ob->data))) && !keep_original) {
                         * so that will be for later.
                         * But at the very least, do not do that with linked IDs! */
                        if ((ID_IS_LINKED(ob) || (ob->data && ID_IS_LINKED(ob->data))) && !keep_original) {