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:
authorAndrea Weikert <elubie@gmx.net>2007-08-19 15:15:33 +0400
committerAndrea Weikert <elubie@gmx.net>2007-08-19 15:15:33 +0400
commitb1c47f4159a1e1b13e066e840a2eaf07665569d8 (patch)
tree06afc464749f6fc50260d6a2b62e230689bda560
parentdbef15f99e8d229a3f77a30a958f9bae2f9fb149 (diff)
- fix for missing include dir in MSVC 7 project files
- small warning fix for unreferenced variable.
-rw-r--r--projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj2
-rw-r--r--source/blender/blenloader/intern/writefile.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
index 6bbd13686d4..ef756c7b67f 100644
--- a/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
+++ b/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
@@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WCHAR_T16,HAVE_LC_MESSAGES,FTGL_LIBRARY_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 925233b4d77..ee914954b90 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1226,7 +1226,7 @@ static void write_images(WriteData *wd, ListBase *idbase)
{
Image *ima;
PackedFile * pf;
- PreviewImage *prv;
+
ima= idbase->first;
while(ima) {
@@ -1242,7 +1242,7 @@ static void write_images(WriteData *wd, ListBase *idbase)
}
if (ima->preview) {
- prv = ima->preview;
+ PreviewImage *prv = ima->preview;
writestruct(wd, DATA, "PreviewImage", 1, prv);
writedata(wd, DATA, prv->w*prv->h*sizeof(unsigned int), prv->rect);
}