diff options
| -rw-r--r-- | projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj | 6 | ||||
| -rw-r--r-- | source/blender/src/header_text.c | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj index c95aed5fe49..2151f581d19 100644 --- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj +++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj @@ -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 diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c index b9d694600e2..f3778c98450 100644 --- a/source/blender/src/header_text.c +++ b/source/blender/src/header_text.c @@ -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 @@ void text_buttons(void) /* 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); } |