diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-03-20 00:08:13 +0300 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-03-20 00:08:13 +0300 |
| commit | 8e92ee86842246c036481bc8a2318ad4c8481b92 (patch) | |
| tree | 5e5097b4a8eb10da9051ef3ab662eb150cbf8c92 /source/blender/src | |
| parent | f74662dcc12cb82fddce7d1c3f7ac122fb1ab7eb (diff) | |
- remove all obsolete inclusions of BLI_winstuff.h (due to recent changes)
NOTE: BLI_winstuff.h was meant to be a wrapper around windows.h to handle
undefining various crap that windows.h defines. Platform specific headers
should only have to be included in a few places. This reduces the number
of inclusions of BLI_winstuff.h to 16 which is a much more reasonable
number (than the 144 or whatever it used to be)
Diffstat (limited to 'source/blender/src')
85 files changed, 9 insertions, 241 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 58285ffd775..42486b9ce33 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 3813001e5e3..802262083df 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -39,10 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 56ef9aa412d..46e66c93a2b 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -35,10 +35,6 @@ #include <stdlib.h> #include <string.h> -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/src/buttons_script.c b/source/blender/src/buttons_script.c index 78eba064faa..3088486322f 100644 --- a/source/blender/src/buttons_script.c +++ b/source/blender/src/buttons_script.c @@ -39,10 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_action_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 397bc4160ad..faa44e2e9f0 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -39,10 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/src/cursors.c b/source/blender/src/cursors.c index 47751348a33..bf258774daa 100644 --- a/source/blender/src/cursors.c +++ b/source/blender/src/cursors.c @@ -36,10 +36,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_listBase.h" #include "DNA_userdef_types.h" diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index b331c3c3bca..b34061b05a1 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -40,10 +40,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "BMF_Api.h" diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 1c3a0fec2f7..b10837a9bfd 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -39,7 +39,6 @@ #ifdef WIN32 #include <io.h> -#include "BLI_winstuff.h" #else #include <unistd.h> #endif diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index fe0f6e461f1..0058019c491 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -43,7 +43,6 @@ #endif #ifdef _WIN32 -#include "BLI_winstuff.h" #pragma warning (once : 4761) #endif diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c index 77b7f21bdda..c20722ad0cb 100644 --- a/source/blender/src/drawipo.c +++ b/source/blender/src/drawipo.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "BMF_Api.h" diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index feb1e50d94e..e4773e56613 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -37,10 +37,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 7c3f21c9cae..f7cd0e94753 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -36,7 +36,6 @@ #ifdef _WIN32 #pragma warning (once : 4761) -#include "BLI_winstuff.h" #endif #include "BMF_Api.h" diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 6acc282b1fd..9703cf28441 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -37,9 +37,6 @@ #include <config.h> #endif -#ifdef _WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BMF_Api.h" diff --git a/source/blender/src/drawoops.c b/source/blender/src/drawoops.c index ea15026bd57..ea90a4c35f1 100644 --- a/source/blender/src/drawoops.c +++ b/source/blender/src/drawoops.c @@ -38,10 +38,6 @@ #include <config.h> #endif -#ifdef _WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/drawscript.c b/source/blender/src/drawscript.c index 5fc48370d75..2c52c20ee95 100644 --- a/source/blender/src/drawscript.c +++ b/source/blender/src/drawscript.c @@ -41,7 +41,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" #include "PIL_time.h" diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index b2659941397..0afcc1aa1a3 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -34,10 +34,6 @@ #include <config.h> #endif -#ifdef _WIN32 -#include "BLI_winstuff.h" -#endif - #include <string.h> #include <math.h> diff --git a/source/blender/src/drawsound.c b/source/blender/src/drawsound.c index 69089bc0cb4..dd0bc08244c 100644 --- a/source/blender/src/drawsound.c +++ b/source/blender/src/drawsound.c @@ -37,10 +37,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BLI_blenlib.h" #include "BLI_arithb.h" diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 58f1f65b05f..7f60adc2099 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -44,7 +44,6 @@ #include <sys/times.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index 4dc044da4a6..747eacbf763 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -40,7 +40,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 6c77ea2e976..f1c4a31eaf6 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -37,10 +37,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "PIL_time.h" diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index c7c10489cc1..7f497a1d872 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -39,10 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "BMF_Api.h" diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index f82fb9f0787..516486eeb8a 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -41,7 +41,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include <stdlib.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index ab17187df38..f2a8dbcf316 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -38,9 +38,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/editika.c b/source/blender/src/editika.c index e7a283a84dc..645d1e805a4 100644 --- a/source/blender/src/editika.c +++ b/source/blender/src/editika.c @@ -42,9 +42,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BMF_Api.h" diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index 800e5418f48..6fb5d411b98 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -39,9 +39,7 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#else +#ifndef WIN32 #include <sys/times.h> #endif diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 574df40c6bb..d218cdac0f7 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -51,7 +51,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" #include "PIL_time.h" diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c index d2cdb1cf8e3..5fd73e2b3c5 100644 --- a/source/blender/src/editkey.c +++ b/source/blender/src/editkey.c @@ -40,7 +40,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editlattice.c b/source/blender/src/editlattice.c index 1469cf97d11..53e2b88c824 100644 --- a/source/blender/src/editlattice.c +++ b/source/blender/src/editlattice.c @@ -39,9 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/editmball.c b/source/blender/src/editmball.c index 1d9e7082dd4..d4529028f03 100644 --- a/source/blender/src/editmball.c +++ b/source/blender/src/editmball.c @@ -36,9 +36,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 2101f5f8642..c0c57fa1721 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -39,9 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "PIL_time.h" diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c index e7247cf1099..4b550c1e105 100644 --- a/source/blender/src/editmesh_add.c +++ b/source/blender/src/editmesh_add.c @@ -39,9 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c index 4490a035bec..e2dd9e699f6 100644 --- a/source/blender/src/editmesh_lib.c +++ b/source/blender/src/editmesh_lib.c @@ -44,9 +44,6 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editmesh_loop.c b/source/blender/src/editmesh_loop.c index 48a92f7d7ed..36ed4e0dddc 100644 --- a/source/blender/src/editmesh_loop.c +++ b/source/blender/src/editmesh_loop.c @@ -40,9 +40,6 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv #include <string.h> #include <math.h> -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 7ac3fc7a03e..52a87aadd16 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -44,9 +44,6 @@ editmesh_mods.c, UI level access, no geometry changes #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "MTC_matrixops.h" diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 9c88d914254..5d8d405661c 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -44,9 +44,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c index 615cce62511..e2c23688736 100644 --- a/source/blender/src/editmode_undo.c +++ b/source/blender/src/editmode_undo.c @@ -39,9 +39,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 4719402e06d..2d95ea7d6ae 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -47,7 +47,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" #include "PIL_time.h" diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c index 584d6a7b2d0..736e2427543 100644 --- a/source/blender/src/editoops.c +++ b/source/blender/src/editoops.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 572e4114c5e..1624ae77b00 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -36,10 +36,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "nla.h" #include <stdlib.h> diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 7de296bd7b6..a1e86248881 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include <sys/types.h> diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 971e0395aa7..25c1d82fb7f 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index c717c695d52..3fa2540ce01 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -40,10 +40,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "IMB_imbuf.h" #include "PIL_time.h" diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index 5effb1fc461..154be0bb4dd 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -36,10 +36,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" diff --git a/source/blender/src/glutil.c b/source/blender/src/glutil.c index a3b8b888881..c1175806947 100644 --- a/source/blender/src/glutil.c +++ b/source/blender/src/glutil.c @@ -38,16 +38,13 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_vec_types.h" #include "BKE_utildefines.h" +#include "BLI_arithb.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 4dbe00ad0d8..b0e2f2a70d6 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_action_types.h" #include "DNA_ipo_types.h" diff --git a/source/blender/src/header_buttonswin.c b/source/blender/src/header_buttonswin.c index 0186683df31..4c12dc5b63b 100644 --- a/source/blender/src/header_buttonswin.c +++ b/source/blender/src/header_buttonswin.c @@ -42,10 +42,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_armature_types.h" #include "DNA_lamp_types.h" diff --git a/source/blender/src/header_filesel.c b/source/blender/src/header_filesel.c index 5177770d5c2..2c068aae627 100644 --- a/source/blender/src/header_filesel.c +++ b/source/blender/src/header_filesel.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index ae05ec4c263..346a59bad00 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -42,10 +42,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_image_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/src/header_imasel.c b/source/blender/src/header_imasel.c index 0f8750426ba..de845fdfaf7 100644 --- a/source/blender/src/header_imasel.c +++ b/source/blender/src/header_imasel.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 027cdee8c8e..3afbf59e750 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_image_types.h" #include "DNA_lamp_types.h" diff --git a/source/blender/src/header_ipo.c b/source/blender/src/header_ipo.c index 0e5210e668c..8f6b558fdb1 100644 --- a/source/blender/src/header_ipo.c +++ b/source/blender/src/header_ipo.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index 5747ac77fc7..c4287ad3ef7 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_ID.h" #include "DNA_nla_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/src/header_oops.c b/source/blender/src/header_oops.c index 24dcd19b97d..3460ac7a05e 100644 --- a/source/blender/src/header_oops.c +++ b/source/blender/src/header_oops.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/header_script.c b/source/blender/src/header_script.c index 56e76cc9d58..fc6a0b45545 100644 --- a/source/blender/src/header_script.c +++ b/source/blender/src/header_script.c @@ -41,10 +41,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BLI_blenlib.h" #include "BSE_headerbuttons.h" diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c index c29ebbaaa43..2f506eb2683 100644 --- a/source/blender/src/header_seq.c +++ b/source/blender/src/header_seq.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/header_sound.c b/source/blender/src/header_sound.c index 3446830a586..53cf5589f74 100644 --- a/source/blender/src/header_sound.c +++ b/source/blender/src/header_sound.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c index 36900d34e60..3dec21b90ab 100644 --- a/source/blender/src/header_text.c +++ b/source/blender/src/header_text.c @@ -43,10 +43,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 9a39b95254f..664ee10bbc2 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -42,10 +42,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BMF_Api.h" #include "BIF_language.h" #ifdef INTERNATIONAL diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 459b3bdd8e2..445fa6db8e1 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -40,10 +40,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "BMF_Api.h" diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index 6c650489016..c4e06851776 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -49,7 +49,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index f3afdb6e44f..1b8f6e8764c 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -49,7 +49,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c index 78bffb222b7..56fef64debd 100644 --- a/source/blender/src/interface_panel.c +++ b/source/blender/src/interface_panel.c @@ -49,7 +49,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/language.c b/source/blender/src/language.c index 8e059da799b..4c71bf93615 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -28,10 +28,6 @@ */ -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include <string.h> #include <stdlib.h> diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 4a09bc535ff..cf5bbb7d2bb 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -52,12 +52,8 @@ void sort_faces(void); #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" - #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/src/mywindow.c b/source/blender/src/mywindow.c index 2da9dff1375..d57d4dde6ba 100644 --- a/source/blender/src/mywindow.c +++ b/source/blender/src/mywindow.c @@ -41,9 +41,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 1f460efc8ea..13d8ad21217 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -35,10 +35,6 @@ #include "MEM_guardedalloc.h" -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c index b685d464cc8..c9b125f10cc 100644 --- a/source/blender/src/playanim.c +++ b/source/blender/src/playanim.c @@ -45,7 +45,6 @@ #include <sys/wait.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c index fffe435968e..c5cf36f70fe 100644 --- a/source/blender/src/poseobject.c +++ b/source/blender/src/poseobject.c @@ -35,10 +35,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include <stdlib.h> #include "BLI_arithb.h" diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index 6418dce5230..87d79a46cc0 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -50,9 +50,6 @@ #endif #include "MEM_guardedalloc.h" #include "BLI_arithb.h" -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "BKE_utildefines.h" #include "MTC_matrixops.h" diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 66e42832db5..9e7e88a96e9 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -38,10 +38,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" diff --git a/source/blender/src/screendump.c b/source/blender/src/screendump.c index 7e54791dbd2..4568eb7f4c5 100644 --- a/source/blender/src/screendump.c +++ b/source/blender/src/screendump.c @@ -37,10 +37,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c index 6e645a8867f..794f00ebd7f 100644 --- a/source/blender/src/seqaudio.c +++ b/source/blender/src/seqaudio.c @@ -36,7 +36,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include <fcntl.h> diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 068d559916b..42cafcf6d77 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -38,10 +38,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #include "PIL_dynlib.h" diff --git a/source/blender/src/space.c b/source/blender/src/space.c index cbea4c5fddb..82669022f41 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -40,10 +40,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "MEM_guardedalloc.h" #ifdef INTERNATIONAL @@ -472,7 +468,7 @@ void start_game(void) space_set_commmandline_options(); SaveState(); - StartKetsjiShell(curarea, startscene->id.name+2, G.main, 1); + //StartKetsjiShell(curarea, startscene->id.name+2, G.main, 1); RestoreState(); /* Restart BPY - unload the game engine modules. */ @@ -1460,6 +1456,12 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case PKEY: if(G.obedit) { +#ifdef USE_ZREXPMESH + if(G.obedit->type==OB_MESH && G.qual==LR_ALTKEY) { + extern void pymesh_edit_menu(void); + pymesh_edit_menu(); + } else +#endif if(G.qual==LR_CTRLKEY || G.qual==(LR_SHIFTKEY|LR_CTRLKEY)) make_parent(); else if((G.qual==0) && G.obedit->type==OB_MESH) diff --git a/source/blender/src/spacetypes.c b/source/blender/src/spacetypes.c index 6c7b083f25f..275c46d4e18 100644 --- a/source/blender/src/spacetypes.c +++ b/source/blender/src/spacetypes.c @@ -36,10 +36,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "BLI_blenlib.h" #include "DNA_screen_types.h" diff --git a/source/blender/src/swapbuffers.c b/source/blender/src/swapbuffers.c index 1a696747290..8e106f52fa2 100644 --- a/source/blender/src/swapbuffers.c +++ b/source/blender/src/swapbuffers.c @@ -46,10 +46,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif - #include "DNA_space_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index f9af3e80973..fe0f1fbcba5 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -46,7 +46,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include <fcntl.h> diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index 72a975d5a0b..4962ceea803 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c index d3c5f12260a..457ac1d9d63 100755 --- a/source/blender/src/transform_constraints.c +++ b/source/blender/src/transform_constraints.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index 2168728b98e..c3ccdf12315 100755 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index 339d365732e..040c352654c 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/transform_numinput.c b/source/blender/src/transform_numinput.c index dcf582b41e7..e051f60e8f0 100755 --- a/source/blender/src/transform_numinput.c +++ b/source/blender/src/transform_numinput.c @@ -42,7 +42,6 @@ #include <unistd.h> #else #include <io.h> -#include "BLI_winstuff.h" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/src/unwrapper.c b/source/blender/src/unwrapper.c index d35bf024edc..0c17647d60a 100644 --- a/source/blender/src/unwrapper.c +++ b/source/blender/src/unwrapper.c @@ -38,9 +38,6 @@ #include <config.h> #endif -#ifdef WIN32 -#include "BLI_winstuff.h" -#endif #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" diff --git a/source/blender/src/view.c b/source/blender/src/view.c index ae068363a15..c67f6681da6 100644 --- a/source/blender/src/view.c +++ b/source/blender/src/view.c @@ -41,7 +41,6 @@ #ifdef WIN32 #include <io.h> -#include "BLI_winstuff.h" #else #include <unistd.h> #endif diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c index c7faa53c200..99a2d3dcc23 100644 --- a/source/blender/src/vpaint.c +++ b/source/blender/src/vpaint.c @@ -39,7 +39,6 @@ #ifdef WIN32 #include <io.h> -#include "BLI_winstuff.h" #else #include <unistd.h> #endif |