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 | |
parent | 61a816e8ff060016f6e450bb6bbd9df5c93665a6 (diff) | |
parent | 5c3953010dca1f9e05ef4b654d957c5f15e91722 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_add.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
3 files changed, 4 insertions, 4 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) { diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index 679bd66753b..ca3707786dd 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -307,7 +307,7 @@ static void scrarea_draw_shape_dark(ScrArea *sa, char dir, unsigned int pos) } /** - * Draw screen area ligher with arrow shape ("eraser" of previous dark shape). + * Draw screen area lighter with arrow shape ("eraser" of previous dark shape). */ static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir), unsigned int pos) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 3576406ee0b..6d8f487b755 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2728,7 +2728,7 @@ static void createTransEditVerts(TransInfo *t) } copy_m3_m4(mtx, tc->obedit->obmat); - /* we use a pseudoinverse so that when one of the axes is scaled to 0, + /* we use a pseudo-inverse so that when one of the axes is scaled to 0, * matrix inversion still works and we can still moving along the other */ pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON); |