[Bf-blender-cvs] [ef0367d] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: ef0367d0948c72ce8eafdf03edc8bd2275385c91
Author: Bastien Montagne
Date:   Fri Mar 27 22:23:47 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBef0367d0948c72ce8eafdf03edc8bd2275385c91

Merge branch 'master' into asset-experiments

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



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

diff --cc source/blender/blenkernel/intern/scene.c
index 6e80aa5,f51dadf..80e8085
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -431,11 -426,9 +431,11 @@@ void BKE_scene_free(Scene *sce
  	if (sce->fps_info)
  		MEM_freeN(sce->fps_info);
  
- 	sound_destroy_scene(sce);
+ 	BKE_sound_destroy_scene(sce);
  
  	BKE_color_managed_view_settings_free(&sce->view_settings);
 +
 +	BKE_previewimg_free(&sce->preview);
  }
  
  Scene *BKE_scene_add(Main *bmain, const char *name)