[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16767] trunk/blender: Fix compilation problem in Windows and update MSVC project files

[Benoit Bolsee]

Revision: 16767
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16767
Author:   ben2610
Date:     2008-09-27 21:05:00 +0200 (Sat, 27 Sep 2008)

Log Message:
-----------
Fix compilation problem in Windows and update MSVC project files

Modified Paths:
--------------
    trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    trunk/blender/source/blender/src/header_text.c

Modified: trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj	2008-09-27 15:32:28 UTC (rev 16766)
+++ trunk/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj	2008-09-27 19:05:00 UTC (rev 16767)
@@ -501,6 +501,9 @@
 				RelativePath="..\..\..\source\blender\blenkernel\intern\shrinkwrap.c">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\simple_deform.c">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c">
 			</File>
 			<File
@@ -724,6 +727,9 @@
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_simple_deform.h">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_softbody.h">
 			</File>
 			<File

Modified: trunk/blender/source/blender/src/header_text.c
===================================================================
--- trunk/blender/source/blender/src/header_text.c	2008-09-27 15:32:28 UTC (rev 16766)
+++ trunk/blender/source/blender/src/header_text.c	2008-09-27 19:05:00 UTC (rev 16767)
@@ -83,6 +83,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+// INT is defined in BIF_interface.h as constant but is also a typedef in Windows
+// This annoying problem should be fixed by using a less conflicting name in Blender.
+#undef INT
+
 #ifndef _WIN32
 #include <unistd.h>
 #else
@@ -1049,9 +1053,10 @@
 	
 	/* Warning button if text is out of date*/
 	if (text && txt_file_modified(text)) {
+		uiBut *bt;
 		xco+= XIC;
 		uiBlockSetCol(block, TH_REDALERT);
-		uiBut *bt= uiDefIconBut(block, BUT, B_NOP, ICON_HELP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "External text is out of sync, click for options to resolve the conflict");
+		bt= uiDefIconBut(block, BUT, B_NOP, ICON_HELP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "External text is out of sync, click for options to resolve the conflict");
 		uiButSetFunc(bt, do_modification_func, (void *)st, NULL);
 		uiBlockSetCol(block, TH_AUTO);
 	}