diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/space_view3d | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_manipulator_forcefield.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5ecef03e475..bca5faa314a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -818,4 +818,3 @@ void ED_draw_object_facemap( dm->release(dm); } - diff --git a/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c b/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c index 305085be370..b42f49e6d1c 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_forcefield.c @@ -120,4 +120,3 @@ void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt) } /** \} */ - diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 267712b3339..27a477bcb3b 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -530,4 +530,3 @@ void view3d_keymap(wmKeyConfig *keyconf) viewzoom_modal_keymap(keyconf); viewdolly_modal_keymap(keyconf); } - |