Revision: 20436
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20436
Author: elubie
Date: 2009-05-26 20:54:39 +0200 (Tue, 26 May 2009)
Log Message:
-----------
2.5 MSVC projectfiles update
- file editors/space_image/image_panels.c -> image_buttons.c (renamed)
- file editors/interface/interface_templates.c added
Also added small fix for crash in filebrowser.
Modified Paths:
--------------
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
Modified:
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-05-26 18:37:46 UTC (rev 20435)
+++
branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-05-26 18:54:39 UTC (rev 20436)
@@ -407,6 +407,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\interface\interface_templates.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
>
</File>
@@ -639,6 +643,10 @@
Name="space_image"
>
<File
+
RelativePath="..\..\..\source\blender\editors\space_image\image_buttons.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_image\image_draw.c"
>
</File>
@@ -655,10 +663,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\space_image\image_panels.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\space_image\image_render.c"
>
</File>
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
2009-05-26 18:37:46 UTC (rev 20435)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
2009-05-26 18:54:39 UTC (rev 20436)
@@ -187,7 +187,7 @@
char *s = string;
BLI_strncpy(temp, "...", 4);
pad = file_string_width(temp);
- while (s && (sw+pad>w)) {
+ while (s && *s && (w > 0) && (sw+pad>w)) {
s++;
sw = file_string_width(s);
shortened = 1;
@@ -200,11 +200,13 @@
}
} else {
char *s = string;
- while (sw>w) {
- int slen = strlen(string);
- string[slen-1] = '\0';
- sw = file_string_width(s);
- shortened = 1;
+ if (w>0) {
+ while (sw>w) {
+ int slen = strlen(string);
+ string[slen-1] = '\0';
+ sw = file_string_width(s);
+ shortened = 1;
+ }
}
if (shortened) {
int slen = strlen(string);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
