archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5

Browse Source 
FileWindow: fixes for Make and Scons, and removed
(commented) unused vars, and adding include files.
This commit is contained in:
Ton Roosendaal
2009-01-06 16:15:43 +00:00
parent 7e7fff7f63
commit 12f099bd91
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_file/Makefile
View File

@@ -37,6 +37,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
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../../blenloader
CPPFLAGS += -I../../blenkernel
CPPFLAGS += -I../../blenlib
CPPFLAGS += -I../../makesdna
CPPFLAGS += -I../../makesrna
CPPFLAGS += -I../../imbuf
CPPFLAGS += -I../../python
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include

2
source/blender/editors/space_file/SConscript
View File

@@ -4,7 +4,7 @@ Import ('env')
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] )

4
source/blender/editors/space_file/file_draw.c
View File

@@ -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 @@ void file_calc_previews(const bContext *C, ARegion *ar)
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;

8
source/blender/editors/space_file/file_ops.c
View File

@@ -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 @@ static void set_active_file_thumbs(SpaceFile *sfile, FileSelectParams* params, s
{
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 @@ static void mouse_select_bookmark(SpaceFile* sfile, ARegion* ar, short *mval)
{
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 void mouse_select_bookmark(SpaceFile* sfile, ARegion* ar, short *mval)
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];

2
source/blender/editors/space_file/filesel.c
View File

@@ -92,7 +92,7 @@ FileSelectParams* ED_fileselect_get_params(const struct bContext *C)
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;