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

[Dalai Felinto]

Commit: 7f1ebeb6ca42278cb8cfb42463e921b3ed615157
Author: Dalai Felinto
Date:   Sun Nov 23 22:40:37 2014 -0200
Branches: multiview
https://developer.blender.org/rB7f1ebeb6ca42278cb8cfb42463e921b3ed615157

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

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



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

diff --cc source/blender/editors/space_image/image_ops.c
index e32eadd,50aee93..0cc35b0
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@@ -1091,28 -1083,11 +1092,29 @@@ static int image_open_exec(bContext *C
  	if (!op->customdata)
  		image_open_init(C, op);
  
 +	/* handle multiview images */
 +	if (RNA_boolean_get(op->ptr, "use_multiple_views")) {
 +		ImageFormatData *imf = &iod->im_format;
 +
 +		ima->views_format = imf->views_format;
 +		*ima->stereo3d_format = imf->stereo3d_format;
 +
 +		BKE_image_update_views_format(scene, ima);
 +	}
 +	else {
 +		ima->flag &= IMA_IS_STEREO;
 +		ima->flag &= IMA_IS_MULTIVIEW;
 +		BKE_image_free_views(ima);
 +
 +		/* monoview and multiview rely on individual images */
 +		ima->views_format = R_IMF_VIEWS_INDIVIDUAL;
 +	}
 +
  	/* only image path after save, never ibuf */
  	if (is_relative_path) {
- 		const char *relbase = ID_BLEND_PATH(bmain, &ima->id);
- 		BLI_path_rel(ima->name, relbase);
+ 		if (!exists) {
+ 			BLI_path_rel(ima->name, bmain->name);
+ 		}
  	}
  
  	/* hook into UI */