diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
commit | eadb192986bab5c7f831d292268c8627871d1acb (patch) | |
tree | 9891101df46a4d3640960a27894866d7927de1ac /source/blenderplayer | |
parent | 92d35b74e79e63ae95732cf3161e84ace1e79e59 (diff) | |
parent | 1649521abe637b5af74174eda0d8ca0b5f1c6ceb (diff) |
svn merge -r41723:41751 ^/trunk/blender
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 96df88ed9b0..c69210ce7fe 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -47,6 +47,7 @@ struct CSG_VertexIteratorDescriptor; struct ColorBand; struct CurveMapping; struct Curve; +struct DerivedMesh; struct EditBone; struct EditFace; struct EditMesh; @@ -77,6 +78,7 @@ struct RenderEngine; struct RenderEngineType; struct RenderLayer; struct RenderResult; +struct Scene; struct ScrArea; struct SculptSession; struct ShadeInput; @@ -217,7 +219,7 @@ int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit){r int ED_space_image_show_render(struct SpaceImage *sima){return 0;} int ED_space_image_show_paint(struct SpaceImage *sima){return 0;} void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings){} -void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){} +void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){} struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;} void ED_screen_set_scene(struct bContext *C, struct Scene *scene){} void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip){} |