Revision: 43582
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43582
Author: campbellbarton
Date: 2012-01-21 14:54:53 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
change filepath limit from 240 to 1024
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenkernel/BKE_main.h
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
trunk/blender/source/blender/blenloader/BLO_readfile.h
trunk/blender/source/blender/blenpluginapi/iff.h
trunk/blender/source/blender/editors/include/UI_interface_icons.h
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/intern/IMB_anim.h
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesdna/DNA_customdata_types.h
trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
trunk/blender/source/blender/makesdna/DNA_node_types.h
trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h
trunk/blender/source/blender/makesdna/DNA_object_force.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_sound_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/DNA_vfont_types.h
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -53,7 +53,7 @@
struct Main *main;
/* strings: lastsaved */
- char ima[256], lib[256];
+ char ima[1024], lib[1024]; /* 1024 = FILE_MAX */
/* flag: if != 0 G.main->name contains valid relative base path */
int relbase_valid;
Modified: trunk/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_main.h 2012-01-21 14:48:07 UTC
(rev 43581)
+++ trunk/blender/source/blender/blenkernel/BKE_main.h 2012-01-21 14:54:53 UTC
(rev 43582)
@@ -50,7 +50,7 @@
typedef struct Main {
struct Main *next, *prev;
- char name[240]; /* 240 = FILE_MAX */
+ char name[1024]; /* 1024 = FILE_MAX */
short versionfile, subversionfile;
short minversionfile, minsubversionfile;
int revision; /* svn revision of binary that saved file */
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -43,9 +43,9 @@
/* these values need to be hardcoded in structs, dna does not recognize
defines */
/* also defined in DNA_space_types.h */
#ifndef FILE_MAXDIR
-#define FILE_MAXDIR 160
-#define FILE_MAXFILE 80
-#define FILE_MAX 240
+#define FILE_MAXDIR 768
+#define FILE_MAXFILE 256
+#define FILE_MAX 1024
#endif
/* this weirdo pops up in two places ... */
Modified: trunk/blender/source/blender/blenloader/BLO_readfile.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_readfile.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/blenloader/BLO_readfile.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -65,7 +65,7 @@
int fileflags;
int displaymode;
int globalf;
- char filename[240]; /* 240 = FILE_MAX */
+ char filename[1024]; /* 1024 = FILE_MAX */
struct bScreen* curscreen;
struct Scene* curscene;
Modified: trunk/blender/source/blender/blenpluginapi/iff.h
===================================================================
--- trunk/blender/source/blender/blenpluginapi/iff.h 2012-01-21 14:48:07 UTC
(rev 43581)
+++ trunk/blender/source/blender/blenpluginapi/iff.h 2012-01-21 14:54:53 UTC
(rev 43582)
@@ -63,7 +63,7 @@
int channels; /**< amount of channels in rect_float
(0 = 4 channel default) */
float dither; /**< random dither value, for
conversion from float -> byte rect */
short profile; /** color space/profile preset that the
byte rect buffer represents */
- char profile_filename[256]; /** to be implemented properly,
specific filename for custom profiles */
+ char profile_filename[1024]; /** to be implemented properly,
specific filename for custom profiles */
/* mipmapping */
struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /**< MipMap levels, a series of
halved images */
Modified: trunk/blender/source/blender/editors/include/UI_interface_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface_icons.h
2012-01-21 14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/editors/include/UI_interface_icons.h
2012-01-21 14:54:53 UTC (rev 43582)
@@ -41,7 +41,7 @@
typedef struct IconFile {
struct IconFile *next, *prev;
- char filename[80]; // FILE_MAXFILE size
+ char filename[256]; // FILE_MAXFILE size
int index;
} IconFile;
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf_types.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf_types.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -50,7 +50,7 @@
struct ImMetaData;
#define IB_MIPMAP_LEVELS 20
-#define IB_FILENAME_SIZE 1023
+#define IB_FILENAME_SIZE 1024
/**
* \ingroup imbuf
Modified: trunk/blender/source/blender/imbuf/intern/IMB_anim.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_anim.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/imbuf/intern/IMB_anim.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -136,9 +136,9 @@
int x, y;
/* voor op nummer */
- char name[256];
+ char name[1024];
/* voor sequence */
- char first[256];
+ char first[1024];
/* movie */
void *movie;
@@ -189,7 +189,7 @@
struct redcode_handle * redcodeCtx;
#endif
- char index_dir[256];
+ char index_dir[768];
int proxies_tried;
int indices_tried;
Modified: trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_indexer.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/imbuf/intern/IMB_indexer.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -62,7 +62,7 @@
} anim_index_entry;
struct anim_index {
- char name[256];
+ char name[1024];
int num_entries;
struct anim_index_entry * entries;
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2012-01-21 14:48:07 UTC
(rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2012-01-21 14:54:53 UTC
(rev 43582)
@@ -128,8 +128,8 @@
ID id;
ID *idblock;
struct FileData *filedata;
- char name[240]; /* path name used for reading, can be
relative and edited in the outliner */
- char filepath[240]; /* absolute filepath, this is only for
convenience,
+ char name[1024]; /* path name used for reading, can be
relative and edited in the outliner */
+ char filepath[1024]; /* absolute filepath, this is only for
convenience,
* 'name' is the real
path used on file read but in
* some cases its
useful to access the absolute one,
* This is set on file
read.
Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -59,7 +59,7 @@
struct ImBuf *icon_imbuf;
PreviewImage *preview;
- char icon_filepath[240]; /* 240 = FILE_MAX */
+ char icon_filepath[1024]; /* 1024 = FILE_MAX */
float normal_weight;
Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h
2012-01-21 14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h
2012-01-21 14:54:53 UTC (rev 43582)
@@ -55,7 +55,7 @@
#define MAX_CUSTOMDATA_LAYER_NAME 64
typedef struct CustomDataExternal {
- char filename[240]; /* FILE_MAX */
+ char filename[1024]; /* FILE_MAX */
} CustomDataExternal;
/** structure which stores custom element data associated with mesh elements
Modified: trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
2012-01-21 14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
2012-01-21 14:54:53 UTC (rev 43582)
@@ -128,7 +128,7 @@
float wave_damping, wave_speed, wave_timescale, wave_spring;
char uvlayer_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
- char image_output_path[240]; /* 240 = FILE_MAX */
+ char image_output_path[1024]; /* 1024 = FILE_MAX */
char output_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
char output_name2[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ /* some surfaces
have 2 outputs */
Modified: trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
2012-01-21 14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
2012-01-21 14:54:53 UTC (rev 43582)
@@ -51,7 +51,7 @@
int revision; /* svn revision from buildinfo */
int pad;
/* file path where this was saved, for recover */
- char filename[240]; /* 240 = FILE_MAX */
+ char filename[1024]; /* 1024 = FILE_MAX */
} FileGlobal;
Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -69,7 +69,7 @@
typedef struct Image {
ID id;
- char name[240]; /* file path, 240 = FILE_MAX */
+ char name[1024]; /* file path, 1024 = FILE_MAX */
ListBase ibufs; /* not written in file
*/
struct GPUTexture *gputexture; /* not written in file */
Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -773,7 +773,7 @@
int bakestart;
int bakeend;
- char cachepath[240]; // FILE_MAX
+ char cachepath[1024]; // FILE_MAX
char foamlayername[64]; /* MAX_CUSTOMDATA_LAYER_NAME */
char cached;
char geometry_mode;
Modified: trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_movieclip_types.h 2012-01-21
14:48:07 UTC (rev 43581)
+++ trunk/blender/source/blender/makesdna/DNA_movieclip_types.h 2012-01-21
14:54:53 UTC (rev 43582)
@@ -51,7 +51,7 @@
} MovieClipUser;
typedef struct MovieClipProxy {
- char dir[160]; /* custom directory for index and proxy
files (defaults to BL_proxy) */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
