Commit: df0253be330178a360af99f758fc250397d07a5b
Author: Bastien Montagne
Date: Thu Jun 7 11:22:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdf0253be330178a360af99f758fc250397d07a5b
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/collada/DocumentExporter.cpp
index c685df84d02,472bd326205..2e5d1757c4c
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -180,8 -181,7 +180,7 @@@ static COLLADABU::NativeString make_tem
// COLLADA allows this through multiple <channel>s in <animation>.
// For this to work, we need to know objects that use a certain action.
-
-int DocumentExporter::exportCurrentScene(bContext *C, const EvaluationContext
*eval_ctx, Scene *sce)
+int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
{
PointerRNA sceneptr, unit_settings;
PropertyRNA *system; /* unused , *scale; */
diff --cc source/blender/collada/collada.h
index 822e12f34e0,907c94855f7..a47463b5a7a
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@@ -51,9 -52,8 +51,8 @@@ struct ViewLayer
int collada_import(struct bContext *C,
ImportSettings *import_settings);
-
int collada_export(struct bContext *C,
- struct EvaluationContext *eval_ctx,
+ struct Depsgraph *depsgraph,
struct Scene *sce,
ExportSettings *export_settings);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
