Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 16:26:50 +0000 (18:26 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 16:26:50 +0000 (18:26 +0200)
Conflicts:
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/armature/pose_utils.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_edit.c
source/blender/editors/transform/transform_conversions.c

1  2 
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_utils.c

index 23414c0647e0d8423804208a1ab1cc3cf60fce81,69199d62556c4be4d09879b4fdf726d319df07e3..12aaa4e73723a5a2a72b2441d3993146746997f7
@@@ -445,14 -452,15 +445,11 @@@ void BKE_scene_make_local(Main *bmain, 
  }
  
  /** Free (or release) any data used by this scene (does not free the scene itself). */
 -void BKE_scene_free(Scene *sce)
 +void BKE_scene_free_ex(Scene *sce, const bool do_id_user)
  {
 -      SceneRenderLayer *srl;
 -
        BKE_animdata_free((ID *)sce, false);
  
-       /* check all sequences */
-       BKE_sequencer_clear_scene_in_allseqs(G.main, sce);
 -      sce->basact = NULL;
 -      BLI_freelistN(&sce->base);
 -      BKE_sequencer_editing_free(sce, false);
 +      BKE_sequencer_editing_free(sce, do_id_user);
  
        BKE_keyingsets_free(&sce->keyingsets);
  
index b64c8528010215b6781d3967c7597fcc92d3fb00,b390f3d0f75ade89bff1baacf2ff2ad793298bf0..e280284a9ced263c9045a905545e931133be5ad8
@@@ -39,7 -39,9 +39,8 @@@
  
  #include "BKE_action.h"
  #include "BKE_armature.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_idprop.h"
+ #include "BKE_main.h"
  
  #include "BKE_context.h"