Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 09:22:11 +0000 (11:22 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 09:23:26 +0000 (11:23 +0200)
 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

1  2 
source/blender/collada/DocumentExporter.cpp
source/blender/collada/collada.h

index c685df84d020e01e3732982e85c6c9b12482c637,472bd326205852bed147d9c0ecec1ede41219e3a..2e5d1757c4cefc9660ad839b56821bd2dd475547
@@@ -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; */
index 822e12f34e0973440aa544678a91c526f5c4a76d,907c94855f7a008a166c5b7463abb0e817823656..a47463b5a7a0e4b16cc2607cb45b47214feb47a0
@@@ -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);