Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj9
-rw-r--r--projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj6
-rw-r--r--projectfiles_vc7/blender/src/BL_src.vcproj6
-rw-r--r--source/blender/imbuf/intern/thumbs.c12
4 files changed, 24 insertions, 9 deletions
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 15614f52fdf..7b7d1ac0608 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -423,6 +423,12 @@
RelativePath="..\..\..\source\blender\blenkernel\intern\modifier.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\multires-firstlevel.c">
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\multires.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\nla.c">
</File>
<File
@@ -616,6 +622,9 @@
RelativePath="..\..\..\source\blender\blenkernel\BKE_modifier.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_multires.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_nla.h">
</File>
<File
diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
index b42642c774f..8a2b8b95e38 100644
--- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
@@ -359,6 +359,9 @@
RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\bpath.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c">
</File>
<File
@@ -429,6 +432,9 @@
RelativePath="..\..\..\source\blender\blenlib\BLI_boxpack2d.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_bpath.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_callbacks.h">
</File>
<File
diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj
index 9c03b21f1a8..9d5e40b96b7 100644
--- a/projectfiles_vc7/blender/src/BL_src.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src.vcproj
@@ -440,9 +440,6 @@
RelativePath="..\..\..\source\blender\src\meshtools.c">
</File>
<File
- RelativePath="..\..\..\source\blender\src\multires-firstlevel.c">
- </File>
- <File
RelativePath="..\..\..\source\blender\src\multires.c">
</File>
<File
@@ -464,6 +461,9 @@
RelativePath="..\..\..\source\blender\blenpluginapi\intern\pluginapi.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\src\poselib.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\poseobject.c">
</File>
<File
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 131d2ef38f7..718b0537b48 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -27,8 +27,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#include "BKE_global.h"
-#include "BKE_utildefines.h"
+/* also defined in BKE_utildefines, repeated here to avoid dependency */
+#define FILE_MAX 240
+
#include "BLI_blenlib.h"
#include "MEM_guardedalloc.h"
@@ -76,18 +77,17 @@ static int get_thumb_dir( char* dir , ThumbSize size)
#endif
switch(size) {
case THB_NORMAL:
- strcat(dir, "/.thumbnails/normal");
+ strcat(dir, "/.thumbnails/normal/");
break;
case THB_LARGE:
- strcat(dir, "/.thumbnails/large");
+ strcat(dir, "/.thumbnails/large/");
break;
case THB_FAIL:
- strcat(dir, "/.thumbnails/fail/blender");
+ strcat(dir, "/.thumbnails/fail/blender/");
break;
default:
return 0; /* unknown size */
}
- BLI_cleanup_dir(G.sce, dir);
return 1;
}