[Bf-blender-cvs] [ad797ed39a4] blender2.8: Fix blenderplayer and collada build.

Brecht Van Lommel noreply at git.blender.org
Tue Apr 17 11:02:31 CEST 2018


Commit: ad797ed39a49d8591d561eca71c170733f8a0c1a
Author: Brecht Van Lommel
Date:   Tue Apr 17 10:58:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBad797ed39a49d8591d561eca71c170733f8a0c1a

Fix blenderplayer and collada build.

===================================================================

M	source/blender/collada/AnimationExporter.h
M	source/blender/collada/DocumentExporter.h
M	source/blender/collada/TransformWriter.cpp
M	source/blenderplayer/bad_level_call_stubs/stubs.c

===================================================================

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



More information about the Bf-blender-cvs mailing list