diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 03:13:28 +0400 |
| commit | f07df7287e60ede904993572fe9bfef2c3a324af (patch) | |
| tree | 205c89f1890164ad384dcd3e5d09547d44287ee3 /source/blender/editors/space_api | |
| parent | 3267a619f1e1a5b5508e38cbc665da79f450b2e3 (diff) | |
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
Diffstat (limited to 'source/blender/editors/space_api')
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 2 |
1 files changed, 0 insertions, 2 deletions
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" |