[Bf-blender-cvs] [48ab2d5] multiview: Merge remote-tracking branch 'origin/master' into multiview

[Dalai Felinto]

Commit: 48ab2d5984b04747fcf95ff899df6e4e9b07097c
Author: Dalai Felinto
Date:   Fri Mar 20 11:33:30 2015 +0100
Branches: multiview
https://developer.blender.org/rB48ab2d5984b04747fcf95ff899df6e4e9b07097c

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
	source/blender/makesrna/intern/rna_scene.c

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



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

diff --cc source/blender/makesrna/intern/rna_scene.c
index 29cda0f,2e94148..4ed8e49
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -1927,26 -1745,18 +1927,38 @@@ static void rna_GPUFXSettings_fx_update
  	BKE_screen_gpu_fx_validate(fx_settings);
  }
  
+ static void rna_GPUDOFSettings_blades_set(PointerRNA *ptr, const int value)
+ {
+ 	GPUDOFSettings *dofsettings = (GPUDOFSettings *)ptr->data;
+ 
+ 	if (value < 3 && dofsettings->num_blades > 2)
+ 		dofsettings->num_blades = 0;
+ 	else if (value > 0 && dofsettings->num_blades == 0)
+ 		dofsettings->num_blades = 3;
+ 	else
+ 		dofsettings->num_blades = value;
+ }
+ 
 +static void rna_Stereo3dFormat_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 +{
 +	ID *id = ptr->id.data;
 +
 +	if (id && GS(id->name) == ID_IM) {
 +		Image *ima = (Image *)id;
 +		ImBuf *ibuf;
 +		void *lock;
 +
 +		if ((ima->flag & IMA_IS_STEREO) == 0)
 +			return;
 +
 +		ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 +
 +		if (ibuf) {
 +			BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 +		}
 +		BKE_image_release_ibuf(ima, ibuf, lock);
 +	}
 +}
  
  #else