From 8f21a43535cb200c0569566a1b012aec883aa53c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Jan 2011 18:36:47 +0000 Subject: split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes. --- source/blender/windowmanager/WM_types.h | 4 ++-- source/blender/windowmanager/intern/wm_draw.c | 1 + source/blender/windowmanager/intern/wm_event_system.c | 1 + source/blender/windowmanager/intern/wm_files.c | 1 + source/blender/windowmanager/intern/wm_gesture.c | 1 + source/blender/windowmanager/intern/wm_keymap.c | 1 + source/blender/windowmanager/intern/wm_operators.c | 5 +++-- source/blender/windowmanager/intern/wm_subwindow.c | 1 + source/blender/windowmanager/intern/wm_window.c | 1 + 9 files changed, 12 insertions(+), 4 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index bbd22cae0f3..728e5f1a800 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -482,14 +482,14 @@ typedef struct wmDrag { int icon, type; /* type, see WM_DRAG defines above */ void *poin; - char path[FILE_MAX]; + char path[240]; /* FILE_MAX */ double value; struct ImBuf *imb; /* if no icon but imbuf should be drawn around cursor */ float scale; short sx, sy; - char opname[FILE_MAX]; /* if set, draws operator name*/ + char opname[240]; /* FILE_MAX */ /* if set, draws operator name*/ } wmDrag; /* dropboxes are like keymaps, part of the screen/area/region definition */ diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 18aa4694d58..efa09865c87 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -39,6 +39,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index b84a00097b1..097286e3d9e 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -41,6 +41,7 @@ #include "GHOST_C-api.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_blender.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 22b10c8c618..b2319eb376f 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -49,6 +49,7 @@ #include "BLI_blenlib.h" #include "BLI_linklist.h" +#include "BLI_utildefines.h" #include "DNA_anim_types.h" #include "DNA_ipo_types.h" // XXX old animation system diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 8d873709212..e0c21e038be 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -37,6 +37,7 @@ #include "BLI_editVert.h" /* lasso tessellation */ #include "BLI_math.h" #include "BLI_scanfill.h" /* lasso tessellation */ +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_utildefines.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a3f662cbbf3..d6d6fc47e4f 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -37,6 +37,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_blender.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index f257b30e96b..a815451e483 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -40,6 +40,8 @@ #include #endif +#include "MEM_guardedalloc.h" + #include "DNA_ID.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" @@ -47,8 +49,6 @@ #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" -#include "MEM_guardedalloc.h" - #include "BLF_api.h" #include "PIL_time.h" @@ -56,6 +56,7 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" /*for WM_operator_pystring */ #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BLO_readfile.h" diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 271b32359f5..aa665ea5aef 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -39,6 +39,7 @@ #include "BLI_blenlib.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 723286b09ce..aa7146cd86f 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -41,6 +41,7 @@ #include "GHOST_C-api.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_blender.h" #include "BKE_context.h" -- cgit v1.2.3