From f07df7287e60ede904993572fe9bfef2c3a324af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 4 Dec 2011 23:13:28 +0000 Subject: manual sync with trunk - pulling in changes where the issues are not bmesh spesific - some merges added lines in multiple times - removed some NULL checks that were only in bmesh - enable cycles by default (was disabled because it used not to work) - make formatting match --- source/blender/editors/space_api/spacetypes.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'source/blender/editors/space_api') diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 9fff70fd5ab..fbf8af514b6 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -39,8 +39,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "bmesh.h" - #include "UI_interface.h" #include "UI_view2d.h" -- cgit v1.2.3