[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18368] branches/blender2.5/blender/source /blender/editors/space_file: 2.5

[Ton Roosendaal]

Revision: 18368
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18368
Author:   ton
Date:     2009-01-06 17:15:43 +0100 (Tue, 06 Jan 2009)

Log Message:
-----------
2.5

FileWindow: fixes for Make and Scons, and removed
(commented) unused vars, and adding include files.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_file/Makefile
    branches/blender2.5/blender/source/blender/editors/space_file/SConscript
    branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
    branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
    branches/blender2.5/blender/source/blender/editors/space_file/filesel.c

Modified: branches/blender2.5/blender/source/blender/editors/space_file/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/Makefile	2009-01-06 15:58:37 UTC (rev 18367)
+++ branches/blender2.5/blender/source/blender/editors/space_file/Makefile	2009-01-06 16:15:43 UTC (rev 18368)
@@ -37,6 +37,7 @@
 
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
+CPPFLAGS += -I$(NAN_BMFONT)/include
 
 # not very neat....
 CPPFLAGS += -I../../windowmanager
@@ -44,6 +45,7 @@
 CPPFLAGS += -I../../blenkernel
 CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../python
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include

Modified: branches/blender2.5/blender/source/blender/editors/space_file/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/SConscript	2009-01-06 15:58:37 UTC (rev 18367)
+++ branches/blender2.5/blender/source/blender/editors/space_file/SConscript	2009-01-06 16:15:43 UTC (rev 18368)
@@ -4,7 +4,7 @@
 sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
-incs += ' ../../blenloader'
+incs += ' ../../blenloader #intern/bmfont ../../makesrna'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
 env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), [], libtype=['core'], priority=[115] )

Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c	2009-01-06 15:58:37 UTC (rev 18367)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c	2009-01-06 16:15:43 UTC (rev 18368)
@@ -26,6 +26,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <string.h>
+
 #include "BLI_blenlib.h"
 #include "BLI_storage_types.h"
 #ifdef WIN32
@@ -273,7 +275,7 @@
 	View2D *v2d= &ar->v2d;
 	int width=0, height=0;
 	int rows, columns;
-	int linestep = U.fontsize*3/2;
+//	int linestep = U.fontsize*3/2;
 
 	if (params->display) {
 		sfile->prv_w = 96;

Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-01-06 15:58:37 UTC (rev 18367)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c	2009-01-06 16:15:43 UTC (rev 18368)
@@ -45,6 +45,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "UI_view2d.h"
+
 #include "file_intern.h"
 #include "filelist.h"
 #include "fsmenu.h"
@@ -63,7 +65,7 @@
 {
 	float x,y;
 	int active_file = -1;
-	int stridex, stridey;
+//	int stridex, stridey;
 	struct direntry* file;
 	int offsetx, offsety;
 	int numfiles = filelist_numfiles(params->files);
@@ -192,7 +194,7 @@
 {
 	if(mval[0]>ar->v2d.mask.xmin && mval[0]<ar->v2d.mask.xmax
 	&& mval[1]>ar->v2d.mask.ymin && mval[1]<ar->v2d.mask.ymax) {			
-		int nentries = fsmenu_get_nentries();
+		//int nentries = fsmenu_get_nentries();
 		char *selected;
 		printf("selecting...\n");
 		set_active_bookmark(sfile, sfile->params, ar, mval[1]);
@@ -212,7 +214,7 @@
 
 static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	ScrArea *sa= CTX_wm_area(C);
+//	ScrArea *sa= CTX_wm_area(C);
 	ARegion *ar= CTX_wm_region(C);
 	SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
 	short mval[2];

Modified: branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/filesel.c	2009-01-06 15:58:37 UTC (rev 18367)
+++ branches/blender2.5/blender/source/blender/editors/space_file/filesel.c	2009-01-06 16:15:43 UTC (rev 18368)
@@ -92,7 +92,7 @@
 short ED_fileselect_set_params(const struct bContext *C, int type, const char *title, const char *path,
 							   short flag, short display, short filter)
 {
-	char group[32], name[FILE_MAX], temp[FILE_MAX], dir[FILE_MAX], file[FILE_MAX];
+	char name[FILE_MAX], dir[FILE_MAX], file[FILE_MAX];
 	SpaceLink *sl= CTX_wm_space_data(C);
 	SpaceFile *sfile;
 	FileSelectParams *params;