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

[Dalai Felinto]

Commit: 2a69362b2b02d3471c63469db2e5b89742c99efe
Author: Dalai Felinto
Date:   Thu Apr 2 09:09:29 2015 -0300
Branches: multiview
https://developer.blender.org/rB2a69362b2b02d3471c63469db2e5b89742c99efe

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

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



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

diff --cc source/blender/makesdna/DNA_sequence_types.h
index 8952062,46a91cf..76c27fd
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@@ -191,12 -187,10 +191,14 @@@ typedef struct Sequence 
  	int sfra;  /* starting frame according to the timeline of the scene. */
  
  	char alpha_mode;
 -	char pad[3];
 +	char pad[2];
 +
 +	/* Multiview */
 +	char views_format;
 +	struct Stereo3dFormat *stereo3d_format;
  
+ 	struct IDProperty *prop;
+ 
  	/* modifiers */
  	ListBase modifiers;
  } Sequence;
diff --cc source/blender/render/intern/source/pipeline.c
index 202acab,4911950..b7d0dd4
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@@ -3703,10 -3272,9 +3703,10 @@@ void RE_layer_load_from_file(RenderLaye
  		IMB_freeImBuf(ibuf);
  	}
  	else {
- 		BKE_reportf(reports, RPT_ERROR, "RE_result_rect_from_file: failed to load '%s'", filename);
+ 		BKE_reportf(reports, RPT_ERROR, "RE_layer_load_from_file: failed to load '%s'", filename);
  	}
  }
 +#endif
  
  void RE_result_load_from_file(RenderResult *result, ReportList *reports, const char *filename)
  {