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

[Dalai Felinto]

Commit: 8ca0401d67d74a1189d6147c975765e25f42917d
Author: Dalai Felinto
Date:   Fri Feb 20 18:35:48 2015 -0200
Branches: multiview
https://developer.blender.org/rB8ca0401d67d74a1189d6147c975765e25f42917d

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

Conflicts:
	source/blender/blenkernel/intern/image.c
	source/blender/editors/space_sequencer/sequencer_draw.c

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



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

diff --cc source/blender/blenkernel/intern/image.c
index 68aab00,5807ea5..2fd65ed
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -753,11 -686,8 +753,10 @@@ Image *BKE_image_load_exists_ex(const c
  			BLI_path_abs(strtest, ID_BLEND_PATH(G.main, &ima->id));
  
  			if (BLI_path_cmp(strtest, str) == 0) {
 -				if (ima->anim == NULL || ima->id.us == 0) {
 +				if ((BKE_image_has_anim(ima) == false) ||
 +				    (ima->id.us == 0))
 +				{
- 					BLI_strncpy(ima->name, filepath, sizeof(ima->name));    /* for stringcode */
- 					ima->id.us++;                                       /* officially should not, it doesn't link here! */
+ 					ima->id.us++;  /* officially should not, it doesn't link here! */
  					if (ima->ok == 0)
  						ima->ok = IMA_OK;
  					if (r_exists)
diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index 8516ff0,b63c46c..9f88cf1
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1021,9 -1019,12 +1022,13 @@@ void draw_image_seq(const bContext *C, 
  	if (G.is_rendering)
  		return;
  
+ 	if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) {
+ 		return;
+ 	}
+ 
 -	ibuf = sequencer_ibuf_get(bmain, scene, sseq, cfra, frame_ofs);
 -	
 +	/* for now we only support Left/Right */
 +	ibuf = sequencer_ibuf_get(bmain, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
- 	
++
  	if (ibuf == NULL)
  		return;