diff options
21 files changed, 38 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 2cb1f91634a..a61efdd4405 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -53,7 +53,7 @@ CPPFLAGS += -I../../imbuf # This mod uses the BLI and BLO module CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../blenloader -CPPFLAGS += -I../../bpython/include +CPPFLAGS += -I../../python # also avi is used CPPFLAGS += -I../../avi CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 067b703abc4..7467fb171cb 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -121,6 +121,7 @@ #include "BKE_displist.h" #include "BKE_curve.h" +#include "BPY_extern.h" /***/ static int is_dxf(char *str); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index d257dd043c0..4a64f2bab5f 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -57,6 +57,8 @@ #include "BKE_displist.h" #include "BKE_material.h" +#include "BPY_extern.h" + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 4968d3a96b7..cabaf088147 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -100,6 +100,8 @@ #include "BKE_constraint.h" #include "BKE_scene.h" +#include "BPY_extern.h" + /* Local function protos */ static void solve_parenting (Object *ob, Object *par, float slowmat[][4], int simul); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 75eb6584026..38c23e3d09c 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -83,6 +83,8 @@ #include "BKE_ika.h" #include "BKE_key.h" +#include "BPY_extern.h" + void free_avicodecdata(AviCodecData *acd) { if (acd) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 01092fe026e..b45efdc819e 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -48,6 +48,8 @@ #include "BKE_global.h" #include "BKE_main.h" +#include "BPY_extern.h" + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index a8a4dfd5a0a..b482140e373 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -56,6 +56,8 @@ #include "BKE_global.h" #include "BKE_main.h" +#include "BPY_extern.h" + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/source/blender/blenloader/intern/Makefile b/source/blender/blenloader/intern/Makefile index 130e936886e..9faeb42879f 100644 --- a/source/blender/blenloader/intern/Makefile +++ b/source/blender/blenloader/intern/Makefile @@ -66,7 +66,7 @@ CPPFLAGS += -I../../blenlib CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../render/extern/include/ -CPPFLAGS += -I../../bpython/include +CPPFLAGS += -I../../python # we still refer to /include a bit... CPPFLAGS += -I../../include diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index 794d8f3b637..b8b1b4a657c 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -64,4 +64,8 @@ void BPY_copy_scriptlink(struct ScriptLink *scriptlink); /* format importer hook */ int BPY_call_importloader(char *name); +int BPY_spacetext_is_pywin(struct SpaceText *st); +void BPY_spacetext_do_pywin_draw(struct SpaceText *st); +void BPY_spacetext_do_pywin_event(struct SpaceText *st, unsigned short event, short val); + void init_syspath(void); diff --git a/source/blender/renderconverter/intern/Makefile b/source/blender/renderconverter/intern/Makefile index baa51065c78..7c99fbfc430 100644 --- a/source/blender/renderconverter/intern/Makefile +++ b/source/blender/renderconverter/intern/Makefile @@ -47,7 +47,7 @@ CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I.. # not very neat: the dirs for external modules CPPFLAGS += -I../../render/extern/include -CPPFLAGS += -I../../bpython/include +CPPFLAGS += -I../../python CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index c6585832053..e9d4d1cf23e 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -100,6 +100,8 @@ #include "nla.h" +#include "BPY_extern.h" + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 16813367fbc..bdb5af6b801 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -66,7 +66,7 @@ CPPFLAGS += -I../render/extern/include CPPFLAGS += -I../renderconverter CPPFLAGS += -I../blenkernel CPPFLAGS += -I../blenlib -CPPFLAGS += -I../bpython/include +CPPFLAGS += -I../python CPPFLAGS += -I../makesdna CPPFLAGS += -I../imbuf CPPFLAGS += -I../img diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index f1a0c4af855..7402e29ea39 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -78,6 +78,8 @@ #include "BSE_filesel.h" +#include "BPY_extern.h" + #include "mydevice.h" #include "blendef.h" diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index cc63bd30400..0e0e5f9da38 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -115,6 +115,8 @@ #include "RE_renderconverter.h" +#include "BPY_extern.h" + #include "blendef.h" #include "mydevice.h" #include "butspace.h" // event codes diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index df9bf3f5d19..86d6ba39929 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -107,6 +107,8 @@ #include "MEM_guardedalloc.h" +#include "BPY_extern.h" + #include "render.h" // for R - should use BKE_bad_level_calls.h instead? #include "blendef.h" diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c index 0b946a0ddfe..f897d01b66a 100644 --- a/source/blender/src/header_text.c +++ b/source/blender/src/header_text.c @@ -72,6 +72,8 @@ #include "BKE_text.h" #include "BSE_filesel.h" +#include "BPY_extern.h" + #include "blendef.h" #include "mydevice.h" diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 04cebac4eb2..020cbe9ed1c 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -166,6 +166,8 @@ #include "BDR_editcurve.h" #include "BDR_editmball.h" +#include "BPY_extern.h" + #include "mydevice.h" #include "blendef.h" #include "render.h" diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 410b6645131..7091544e2bd 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -130,6 +130,8 @@ #include "BLO_readfile.h" /* for BLO_blendhandle_close */ +#include "BPY_extern.h" + #include "mydevice.h" #include "blendef.h" #include "datatoc.h" diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 521075db950..60e1ae64f99 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -106,6 +106,8 @@ #include "BDR_editobject.h" #include "BDR_vpaint.h" +#include "BPY_extern.h" + #include "blendef.h" #include "radio.h" diff --git a/source/creator/Makefile b/source/creator/Makefile index c50f720acb5..1074adf9b2b 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -53,7 +53,7 @@ CPPFLAGS += -I../blender/blenlib CPPFLAGS += -I../blender/include CPPFLAGS += -I../blender/renderconverter CPPFLAGS += -I../blender/blenkernel -CPPFLAGS += -I../blender/bpython/include +CPPFLAGS += -I../blender/python CPPFLAGS += -I../blender/blenloader CPPFLAGS += -I../kernel/gen_system CPPFLAGS += -I../kernel/gen_messaging diff --git a/source/creator/creator.c b/source/creator/creator.c index cdcdc731711..c92d034d2a6 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -78,6 +78,8 @@ #include "RE_renderconverter.h" +#include "BPY_extern.h" + #include "playanim_ext.h" #include "mydevice.h" #include "render.h" |