diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-05-04 13:41:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-05-04 13:41:15 +0400 |
| commit | 110f927c636778fedddccb041553fc6040f4ffd8 (patch) | |
| tree | 350e9e82b6406ab8e633286faade5e0af5be9272 /source/blender/src/buttons_shading.c | |
| parent | f95c1141db077ea9323dd4f1d8852e365aadb2b1 (diff) | |
Changed frame numbering to only alter hashes if they are in the filename (not the directory name) to fix bug [#10566] File Open Dialog replaces '#' with '0' in directory names.
removed frame numbering from BLI_convertstringcode into its own function (BLI_convertstringframe), many uses of BLI_convertstringcode were passing dummy frames values anyway.
in cases where adding the current frame number to a filename is needed run BLI_convertstringframe(...) after BLI_convertstringcode(...)
There are some cases Im not sure BLI_convertstringframe is needed, these have been commented as todo, but at least have the same functionality they used to.
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 5e420ade204..9704b0186cd 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -238,7 +238,7 @@ static void save_env(char *name) char str[FILE_MAX]; strcpy(str, name); - BLI_convertstringcode(str, G.sce, G.scene->r.cfra); + BLI_convertstringcode(str, G.sce); tex= G.buts->lockpoin; if(tex && GS(tex->id.name)==ID_TE) { |