diff options
author | mano-wii <germano.costa@ig.com.br> | 2017-08-17 01:10:18 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2017-08-17 01:10:18 +0300 |
commit | 264d0cc6a0fc292f3e5e6ebcdbe9195fb0480279 (patch) | |
tree | 3dc61a68923d05d6255cd2498b7041067da679aa /source/blender/editors/space_view3d | |
parent | 4b6c482d69cd35b9527dfe0d0ad7c73dfa8fb1ff (diff) | |
parent | 9b1e0f5af6f11432d7b62b5ba87a4cc0e3175bd1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_walk.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index f62a12b071f..9aaa766be74 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -51,7 +51,6 @@ #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_transform.h" #include "ED_transform_snap_object_context.h" #include "ED_space_api.h" diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index d4642edf084..44b7fadd29f 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -49,7 +49,6 @@ #include "ED_screen.h" #include "ED_space_api.h" -#include "ED_transform.h" #include "ED_transform_snap_object_context.h" #include "PIL_time.h" /* smoothview */ |