diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 18:38:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 18:38:11 +0400 |
| commit | f1eb66aa68105ac27f371f4f708d8abf3b7da38b (patch) | |
| tree | 77ce3c813f25702880e330740e06ae60a0aadca8 /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | be701c7336a3f967a3a2807f8a7a0c511cb76815 (diff) | |
share code for fluidsim, ocean & dynamic paint file paths.
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 250c61ed5f4..6816903090d 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -77,7 +77,7 @@ static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name if(BKE_imtype_is_movie(rd->imtype)) BKE_makeanimstring(name, rd); else - BKE_makepicstring(name, rd->pic, (frame==INT_MIN) ? rd->cfra : frame, rd->imtype, rd->scemode & R_EXTENSION, TRUE); + BKE_makepicstring(name, rd->pic, G.main->name, (frame==INT_MIN) ? rd->cfra : frame, rd->imtype, rd->scemode & R_EXTENSION, TRUE); } #ifdef WITH_COLLADA |