diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-19 15:14:58 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-19 15:14:58 +0300 |
| commit | d92b45d558b861ef3c314f1d9c926113aa36326c (patch) | |
| tree | d057b1bf627026fc1bbecec74e4625ed737d5229 /source/blender/windowmanager/intern | |
| parent | c752ec9fc458f6fd1fc0ae7a156d33bf86e73eff (diff) | |
2.5
Drawing code for space_view3d module.
It's still not cleaned, have to check on context usage still.
Also missing is editmodes, armatures, and probably more.
Known issue: splitting to 2nd window gives bad opengl lighting.
Picture for fun:
http://www.blender.org/bf/rt2.jpg
Current stat: brought back almost 10k lines! :)
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 12 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile index 00412f00445..5ca68bef0a2 100644 --- a/source/blender/windowmanager/intern/Makefile +++ b/source/blender/windowmanager/intern/Makefile @@ -57,6 +57,7 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../nodes CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../gpu CPPFLAGS += -I../../render/extern/include CPPFLAGS += -I../../ftfont CPPFLAGS += -I../../radiosity/extern/include diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index ae84ac26979..d8448be30ab 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -69,8 +69,6 @@ #include "SYS_System.h" -#include "UI_interface.h" - #include "RNA_define.h" #include "WM_api.h" @@ -84,6 +82,12 @@ #include "ED_screen.h" +#include "UI_interface.h" + +#include "GPU_extensions.h" +#include "GPU_draw.h" + + static void initbuttons(void) { UI_init(); @@ -135,7 +139,9 @@ void WM_init(bContext *C) // XXX UI_filelist_init_icons(); -// init_gl_stuff(); /* drawview.c, after homefile */ + GPU_state_init(); + GPU_extensions_init(); + read_Blog(); BLI_strncpy(G.lib, G.sce, FILE_MAX); } diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 56574829b53..7477cb35a6d 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -445,7 +445,7 @@ static unsigned int index_to_framebuffer(int index) #endif -void set_framebuffer_index_color(int index) +void WM_set_framebuffer_index_color(int index) { cpack(index_to_framebuffer(index)); } |