diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 12:22:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 12:23:26 +0300 |
commit | df0253be330178a360af99f758fc250397d07a5b (patch) | |
tree | 2ad8e142bf1dde38f59ab5c295e0f3c5c6545cc3 /source/blender | |
parent | e27759152ab662145e22d89b061bd1b95949b378 (diff) | |
parent | 54f9cd52835bdd96cdd01cf643cfccf8a229c04b (diff) |
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
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 1 | ||||
-rw-r--r-- | source/blender/collada/collada.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index c685df84d02..2e5d1757c4c 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -180,7 +180,6 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char * // 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, Scene *sce) { PointerRNA sceneptr, unit_settings; diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index 822e12f34e0..a47463b5a7a 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -51,7 +51,6 @@ struct ViewLayer; int collada_import(struct bContext *C, ImportSettings *import_settings); - int collada_export(struct bContext *C, struct Depsgraph *depsgraph, struct Scene *sce, |