Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-11-28 18:26:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2014-11-28 18:26:44 +0300
commit6336b215a9cb1a90b6aaa65f39033fc23cfe1591 (patch)
treee9a5569d59a04d1287074b02bd51ee60d2de6fdd /source/blender/editors/space_view3d/view3d_edit.c
parentf74e4d9dfefdaa04c489adf6d31037c43d195faa (diff)
parentbcbbc66795e221474f889b7ab9b7320948aefdec (diff)
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 28066b1ffe4..e42eda59441 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -49,9 +49,7 @@
#include "BKE_camera.h"
#include "BKE_context.h"
#include "BKE_font.h"
-#include "BKE_image.h"
#include "BKE_library.h"
-#include "BKE_main.h"
#include "BKE_object.h"
#include "BKE_paint.h"
#include "BKE_report.h"