[Bf-blender-cvs] [a835547] blender-v2.75-release: Fix T45251 custom directory not taken into account for image proxies.

[Antony Riakiotakis]

Commit: a8355471b92fee025cfa3785c8ea45ef3f3badef
Author: Antony Riakiotakis
Date:   Tue Jun 30 16:31:14 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rBa8355471b92fee025cfa3785c8ea45ef3f3badef

Fix T45251 custom directory not taken into account for image proxies.

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

M	source/blender/blenkernel/intern/sequencer.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index d4d64af..b4eba71 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1608,7 +1608,10 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render
 		BLI_path_append(dir, sizeof(dir), fname);
 	}
 	else if (seq->type == SEQ_TYPE_IMAGE) {
-		BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
+		if (proxy->storage & SEQ_STORAGE_PROXY_CUSTOM_DIR)
+			BLI_strncpy(dir, seq->strip->proxy->dir, sizeof(dir));
+		else
+			BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
 	}
 	else {
 		return false;