diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-24 08:48:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-24 09:26:59 +0300 |
| commit | d036ad552faf7e1a245d7b939cef1ddab2c5153a (patch) | |
| tree | 915118ef79e7cfe0dff8a2d06e24b9ace2778ace /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | fcda27cdaedfcf79607b13dbf5c6fe670e95d2ac (diff) | |
BKE_image: use BKE_image_*** prefix
use bools for return values and some api naming consistency.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index be618c5d1a3..36657c8a898 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -121,11 +121,14 @@ static void rna_Scene_update_tagged(Scene *scene) static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name) { - if (BKE_imtype_is_movie(rd->im_format.imtype)) + if (BKE_imtype_is_movie(rd->im_format.imtype)) { BKE_movie_filepath_get(name, rd); - else - BKE_makepicstring(name, rd->pic, G.main->name, (frame == INT_MIN) ? rd->cfra : frame, - &rd->im_format, (rd->scemode & R_EXTENSION) != 0, true); + } + else { + BKE_image_path_from_imformat( + name, rd->pic, G.main->name, (frame == INT_MIN) ? rd->cfra : frame, + &rd->im_format, (rd->scemode & R_EXTENSION) != 0, true); + } } static void rna_Scene_ray_cast(Scene *scene, float ray_start[3], float ray_end[3], |