[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11166] branches/imgbrowser-elubie/source/ blender/src: - fixed compile error on MSVC

[Andrea Weikert]

Revision: 11166
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11166
Author:   elubie
Date:     2007-07-04 20:35:21 +0200 (Wed, 04 Jul 2007)

Log Message:
-----------
- fixed compile error on MSVC
- fixed crash when opening imagebrowser directly from space menu
- fixed copy error from filesel

Modified Paths:
--------------
    branches/imgbrowser-elubie/source/blender/src/buttons_editing.c
    branches/imgbrowser-elubie/source/blender/src/editimasel.c
    branches/imgbrowser-elubie/source/blender/src/space.c

Modified: branches/imgbrowser-elubie/source/blender/src/buttons_editing.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/buttons_editing.c	2007-07-04 07:07:12 UTC (rev 11165)
+++ branches/imgbrowser-elubie/source/blender/src/buttons_editing.c	2007-07-04 18:35:21 UTC (rev 11166)
@@ -5211,11 +5211,11 @@
 		uiBlockSetCol(block, TH_AUTO);
 
 		if(brush && !brush->id.lib) {
+			MTex *mtex= brush->mtex[brush->texact];
+
 			xco= 40;
 			butw= 130;
-			yco = 130;
-			
-			MTex *mtex= brush->mtex[brush->texact];
+			yco = 130;			
 		
 			uiBlockBeginAlign(block);
 			uiDefButF(block, COL, B_VPCOLSLI, "",					xco,yco,140,19, brush->rgb, 0, 0, 0, 0, "");

Modified: branches/imgbrowser-elubie/source/blender/src/editimasel.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/editimasel.c	2007-07-04 07:07:12 UTC (rev 11165)
+++ branches/imgbrowser-elubie/source/blender/src/editimasel.c	2007-07-04 18:35:21 UTC (rev 11166)
@@ -332,7 +332,7 @@
 	simasel= curarea->spacedata.first;
 
 	/* cleanup */
-	if(simasel->spacetype==SPACE_FILE) {
+	if(simasel->spacetype==SPACE_IMASEL) {
 		if(simasel->pupmenu) {
 			MEM_freeN(simasel->pupmenu);
 			simasel->pupmenu= NULL;

Modified: branches/imgbrowser-elubie/source/blender/src/space.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/space.c	2007-07-04 07:07:12 UTC (rev 11165)
+++ branches/imgbrowser-elubie/source/blender/src/space.c	2007-07-04 18:35:21 UTC (rev 11166)
@@ -5561,11 +5561,15 @@
 	else if(sa->spacetype==SPACE_IMASEL) {
 		SpaceImaSel *simasel= sa->spacedata.first;
 		if(simasel->type==FILE_MAIN) {
-			BIF_filelist_free(simasel->files);
-			BIF_filelist_settype(simasel->files, FILE_MAIN);
+			if (simasel->files) {
+				BIF_filelist_free(simasel->files);
+				BIF_filelist_settype(simasel->files, FILE_MAIN);
+			}
 		} else {
-			simasel->type= FILE_UNIX;
-			BIF_filelist_settype(simasel->files, simasel->type);
+			if (simasel->files) {
+				simasel->type= FILE_UNIX;
+				BIF_filelist_settype(simasel->files, simasel->type);
+			}
 		}
 		simasel->returnfunc= NULL;
 		simasel->title[0]= 0;