Commit: 9b9b943e0c7fb5c921a54521c4a7c55f7a7f22ba
Author: Bastien Montagne
Date: Tue Jun 12 18:26:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9b9b943e0c7fb5c921a54521c4a7c55f7a7f22ba
Merge branch 'master' into blender2.8
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
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/scene.c
index 23414c0647e,69199d62556..12aaa4e7372
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -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);
diff --cc source/blender/editors/armature/pose_utils.c
index b64c8528010,b390f3d0f75..e280284a9ce
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@@ -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"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
