diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /release/scripts/startup/bl_operators/object.py | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'release/scripts/startup/bl_operators/object.py')
| -rw-r--r-- | release/scripts/startup/bl_operators/object.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index c49591ff300..8b751ed2ebf 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -476,7 +476,7 @@ class ShapeTransfer(Operator): objects = [ob for ob in context.selected_editable_objects if ob != ob_act] - if 1: # swap from/to, means we cant copy to many at once. + if 1: # swap from/to, means we can't copy to many at once. if len(objects) != 1: self.report({'ERROR'}, ("Expected one other selected " |