diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
| commit | cb890a49fbd653c71d2fe639265a1a562136113f (patch) | |
| tree | 10ddd1f7198c85408f83794fe560caa9512e2a2e /source/blenderplayer | |
| parent | aea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (diff) | |
| parent | f086201518b85f6dd2ae60ae37dc14f1d1406c01 (diff) | |
svn merge ^/trunk/blender -r41602:41638 .
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 963f521c781..913b6523ae6 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -168,6 +168,12 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_colamd) + if(WITH_LIBMV) + list(APPEND BLENDER_SORTED_LIBS extern_libmv) + endif() + + list(APPEND BLENDER_SORTED_LIBS extern_colamd) + if(WITH_MOD_DECIMATE) list(APPEND BLENDER_SORTED_LIBS bf_intern_decimate) endif() diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 3119c4c1d11..8945d6d26cc 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -41,6 +41,7 @@ struct ARegionType; struct Base; struct Brush; struct bNodeTree; +struct bNodeSocket; struct CSG_FaceIteratorDescriptor; struct CSG_VertexIteratorDescriptor; struct ColorBand; @@ -212,6 +213,7 @@ void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings void ED_space_image_set(struct bContext *C, 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){} void ED_area_tag_redraw_regiontype(struct ScrArea *sa, int regiontype){} void ED_render_engine_changed(struct Main *bmain) {} @@ -269,6 +271,7 @@ void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene){} int ED_view3d_scene_layer_set(int lay, const int *values){return 0;} void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){} void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist){} +struct BGpic *ED_view3D_background_image_add(struct View3D *v3d){return (struct BGpic *) NULL;} void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist){} int text_file_modified(struct Text *text){return 0;} void ED_node_shader_default(struct Material *ma){} @@ -386,7 +389,12 @@ void uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char * void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op){} void uiTemplateWaveform(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){} void uiTemplateVectorscope(struct uiLayout *_self, struct PointerRNA *data, char* property, int expand){} +void uiTemplateNodeLink(struct uiLayout *layout, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input) {} +void uiTemplateNodeView(struct uiLayout *layout, struct bContext *C, struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *input) {} void uiTemplateKeymapItemProperties(struct uiLayout *layout, struct PointerRNA *ptr){} +void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact){} +void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname){} +void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, PointerRNA *userptr, PointerRNA *trackptr, int compact){} /* rna render */ struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;} |