[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15579] trunk/blender/source/blender/src/ buttons_scene.c: Fix segfault in the Sequence.

[Diego Borghetti]

Revision: 15579
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15579
Author:   bdiego
Date:     2008-07-15 03:23:56 +0200 (Tue, 15 Jul 2008)

Log Message:
-----------
Fix segfault in the Sequence.

If you enable the Proxy and Custom Dir options and later disable
the Proxy (but not the Custom Dir options), Blender crash every
time that you try select the strip, because the proxy don't exist
anymore.

The solution: only draw the Custom Dir button if the Proxy
option is enable.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_scene.c

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2008-07-15 01:07:19 UTC (rev 15578)
+++ trunk/blender/source/blender/src/buttons_scene.c	2008-07-15 01:23:56 UTC (rev 15579)
@@ -1180,18 +1180,18 @@
 			     130,140,120,19, &last_seq->flag, 
 			     0.0, 21.0, 100, 0, 
 			     "Use a custom directory to store data");
-	}
 
-	if (last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
-		uiDefIconBut(block, BUT, B_SEQ_SEL_PROXY_DIR, 
-			     ICON_FILESEL, 10, 120, 20, 20, 0, 0, 0, 0, 0, 
-			     "Select the directory/name for "
-			     "the proxy storage");
+		if (last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
+			uiDefIconBut(block, BUT, B_SEQ_SEL_PROXY_DIR, 
+				     ICON_FILESEL, 10, 120, 20, 20, 0, 0, 0, 0, 0, 
+				     "Select the directory/name for "
+				     "the proxy storage");
 
-		uiDefBut(block, TEX, 
-			 B_SEQ_BUT_RELOAD, "Dir: ", 
-			 30,120,220,20, last_seq->strip->proxy->dir, 
-			 0.0, 160.0, 100, 0, "");
+			uiDefBut(block, TEX, 
+				 B_SEQ_BUT_RELOAD, "Dir: ", 
+				 30,120,220,20, last_seq->strip->proxy->dir, 
+				 0.0, 160.0, 100, 0, "");
+		}
 	}
 
 	if (last_seq->flag & SEQ_USE_PROXY) {