diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-17 11:58:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-17 12:01:52 +0300 |
| commit | ad797ed39a49d8591d561eca71c170733f8a0c1a (patch) | |
| tree | c0d6a3d2c8df474233c7a7d07236a30bb9a38dae /source | |
| parent | c9d1082a2c17162ea6d23415e3560dabfc6e22e1 (diff) | |
Fix blenderplayer and collada build.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/collada/AnimationExporter.h | 2 | ||||
| -rw-r--r-- | source/blender/collada/DocumentExporter.h | 2 | ||||
| -rw-r--r-- | source/blender/collada/TransformWriter.cpp | 4 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index bbd7fdb9a63..2ed0a92d89c 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -91,8 +91,8 @@ private: public: AnimationExporter(Depsgraph *depsgraph, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): - depsgraph(depsgraph), COLLADASW::LibraryAnimations(sw), + depsgraph(depsgraph), export_settings(export_settings) { this->sw = sw; diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h index b420140c3bf..c98f82e68b4 100644 --- a/source/blender/collada/DocumentExporter.h +++ b/source/blender/collada/DocumentExporter.h @@ -44,8 +44,8 @@ class DocumentExporter void exportScenes(const char *filename); private: - const ExportSettings *export_settings; Depsgraph *depsgraph; + const ExportSettings *export_settings; }; #endif diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index 84817d76073..1fb54e99147 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -26,8 +26,10 @@ */ -#include "BKE_object.h" #include "BLI_math.h" +#include "BLI_sys_types.h" + +#include "BKE_object.h" #include "TransformWriter.h" diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index b35fb30af66..1ab9f9fac98 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -484,6 +484,8 @@ void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name) RET struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob) RET_NULL void PE_current_changed(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob) RET_NONE +struct PTCacheEdit *PE_create_current(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob) RET_NULL +void PE_update_object( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, int useflag) RET_NONE /* rna keymap */ struct wmKeyMap *WM_keymap_active(struct wmWindowManager *wm, struct wmKeyMap *keymap) RET_NULL |