diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-19 02:28:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-19 02:28:26 +0300 |
| commit | d46d8e831ce0c6a519d60cdcb4c8a5d4f5a88428 (patch) | |
| tree | 9c87e6aa0832734a7a4b01e835bacc416138fb00 /source/blender/editors/object | |
| parent | 61a816e8ff060016f6e450bb6bbd9df5c93665a6 (diff) | |
| parent | 5c3953010dca1f9e05ef4b654d957c5f15e91722 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index a760086abae..c481a62acb7 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -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 - * 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) { |