griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5 MSVC projectfiles update

Browse Source 
- 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.
This commit is contained in:
Andrea Weikert
2009-05-26 18:54:39 +00:00
parent c590dd3e8c
commit 3159f4a243
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projectfiles_vc9/blender/editors/ED_editors.vcproj
View File

@@ -406,6 +406,10 @@
RelativePath="..\..\..\source\blender\editors\interface\interface_style.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\editors\interface\interface_templates.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\editors\interface\interface_utils.c"
>
@@ -638,6 +642,10 @@
<Filter
Name="space_image"
>
<File
RelativePath="..\..\..\source\blender\editors\space_image\image_buttons.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\editors\space_image\image_draw.c"
>
@@ -654,10 +662,6 @@
RelativePath="..\..\..\source\blender\editors\space_image\image_ops.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\editors\space_image\image_panels.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\editors\space_image\image_render.c"
>

14
source/blender/editors/space_file/file_draw.c
View File

@@ -187,7 +187,7 @@ static float shorten_string(char* string, float w, int flag)
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 @@ static float shorten_string(char* string, float w, int flag)
}
} 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);