[Bf-blender-cvs] [6711e9d] missing-libs: Merge branch 'master' into missing-libs

[Bastien Montagne]

Commit: 6711e9d15f54950de58d413c077acb0cc3bda9d0
Author: Bastien Montagne
Date:   Sat Aug 22 15:11:32 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB6711e9d15f54950de58d413c077acb0cc3bda9d0

Merge branch 'master' into missing-libs

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



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

diff --cc source/blender/blenkernel/intern/scene.c
index 1608896,701483a..51ffe5c
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -455,10 -460,13 +460,12 @@@ void BKE_scene_free(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)
 +void BKE_scene_init(Scene *sce)
  {
 -	Scene *sce;
  	ParticleEditSettings *pset;
  	int a;
  	const char *colorspace_name;
@@@ -734,16 -741,9 +741,18 @@@
  	copy_v2_fl2(sce->safe_areas.action, 10.0f / 100.0f, 5.0f / 100.0f);
  	copy_v2_fl2(sce->safe_areas.title_center, 17.5f / 100.0f, 5.0f / 100.0f);
  	copy_v2_fl2(sce->safe_areas.action_center, 15.0f / 100.0f, 5.0f / 100.0f);
 +}
 +
 +Scene *BKE_scene_add(Main *bmain, const char *name)
 +{
 +	Scene *sce;
 +
 +	sce = BKE_libblock_alloc(bmain, ID_SCE, name);
 +
 +	BKE_scene_init(sce);
  
+ 	sce->preview = NULL;
+ 
  	return sce;
  }