[Bf-blender-cvs] [58fb70a] soc-2016-layer_manager: Merge branch 'master' into soc-2016-layer_manager

[Julian Eisel]

Commit: 58fb70a0b84f42b01ce6023a5c3103cd8b363078
Author: Julian Eisel
Date:   Fri Jun 24 16:28:56 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB58fb70a0b84f42b01ce6023a5c3103cd8b363078

Merge branch 'master' into soc-2016-layer_manager

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/scene.c
index 1b4a7d4,0e8efca..d0b08d8
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -445,21 -437,9 +438,14 @@@ void BKE_scene_free(Scene *sce
  	if (sce->depsgraph)
  		DEG_graph_free(sce->depsgraph);
  	
- 	if (sce->nodetree) {
- 		ntreeFreeTree(sce->nodetree);
- 		MEM_freeN(sce->nodetree);
- 	}
- 
- 	if (sce->stats)
- 		MEM_freeN(sce->stats);
- 	if (sce->fps_info)
- 		MEM_freeN(sce->fps_info);
+ 	MEM_SAFE_FREE(sce->stats);
+ 	MEM_SAFE_FREE(sce->fps_info);
  
 +#ifdef WITH_ADVANCED_LAYERS
 +	BLI_assert(sce->object_layers != NULL);
 +	BKE_layertree_delete(sce->object_layers);
 +#endif
 +
  	BKE_sound_destroy_scene(sce);
  
  	BKE_color_managed_view_settings_free(&sce->view_settings);