archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix [#24462] UV Layouts saved as PNG results in two files (one is 0 KB, other has corrupted filename)

Browse Source
This commit is contained in:
Campbell Barton
2010-11-01 01:46:26 +00:00
parent 29bcda37fd
commit d9a7358b4c
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenlib/intern/path_util.c
View File

@@ -543,9 +543,20 @@ int BLI_path_frame(char *path, int frame, int digits)
ensure_digits(path, digits);
if (stringframe_chars(path, &ch_sta, &ch_end)) { /* warning, ch_end is the last # +1 */
char tmp[FILE_MAX], format[64];
char tmp[FILE_MAX];
#if 0 // neat but breaks on non ascii strings.
char format[64];
sprintf(format, "%%.%ds%%.%dd%%s", ch_sta, ch_end-ch_sta); /* example result: "%.12s%.5d%s" */
sprintf(tmp, format, path, frame, path+ch_end);
#else
char format[8];
char *p;
sprintf(format, "%%.%dd", ch_end-ch_sta); /* example result: "%.5d" */
memcpy(tmp, path, sizeof(char) * ch_sta);
p= tmp + ch_sta;
p += sprintf(p, format, frame);
memcpy(p, path + ch_end, strlen(path + ch_end));
#endif
strcpy(path, tmp);
return 1;
}

1
source/blender/makesrna/RNA_define.h
View File

@@ -132,6 +132,7 @@ void RNA_def_property_collection_sdna(PropertyRNA *prop, const char *structname,
void RNA_def_property_flag(PropertyRNA *prop, int flag);
void RNA_def_property_clear_flag(PropertyRNA *prop, int flag);
void RNA_def_property_subtype(PropertyRNA *prop, PropertySubType subtype);
void RNA_def_property_array(PropertyRNA *prop, int length);
void RNA_def_property_multi_array(PropertyRNA *prop, int dimension, int length[]);
void RNA_def_property_range(PropertyRNA *prop, double min, double max);

5
source/blender/makesrna/intern/rna_define.c
View File

@@ -1005,6 +1005,11 @@ void RNA_def_property_clear_flag(PropertyRNA *prop, int flag)
prop->flag &= ~flag;
}
void RNA_def_property_subtype(PropertyRNA *prop, PropertySubType subtype)
{
prop->subtype= subtype;
}
void RNA_def_property_array(PropertyRNA *prop, int length)
{
StructRNA *srna= DefRNA.laststruct;

3
source/blender/makesrna/intern/rna_scene_api.c
View File

@@ -96,8 +96,9 @@ void RNA_api_scene_render(StructRNA *srna)
func= RNA_def_function(srna, "frame_path", "rna_SceneRender_get_frame_path");
RNA_def_function_ui_description(func, "Return the absolute path to the filename to be written for a given frame.");
parm= RNA_def_int(func, "frame", INT_MIN, INT_MIN, INT_MAX, "", "Frame number to use, if unset the current frame will be used.", MINAFRAME, MAXFRAME);
parm= RNA_def_string(func, "name", "", FILE_MAX, "File Name", "the resulting filename from the scenes render settings.");
parm= RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "the resulting filepath from the scenes render settings.");
RNA_def_property_flag(parm, PROP_THICK_WRAP); /* needed for string return value */
RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
RNA_def_function_output(func, parm);
}