diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-30 06:25:27 +0400 |
| commit | 0d6ae3fda2e5a3dbde941b6985e6895a42c71b9e (patch) | |
| tree | b0c89b9a01da31fffc6b6db7c9395ff2db97de53 /source/blender/editors/render | |
| parent | 19103b443711d7c1b3a24f7fab949f71343d8200 (diff) | |
Main API: refactor naming, use BKE_main_ prefix and add main arg.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 091dc11f500..b4414cf3f54 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -578,7 +578,7 @@ static void render_endjob(void *rjv) RE_InitRenderCB(rj->re); if (rj->main != G.main) - free_main(rj->main); + BKE_main_free(rj->main); /* else the frame will not update for the original value */ if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) { diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 99f86371eb3..3f507cd5020 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -221,10 +221,10 @@ void ED_preview_init_dbase(void) void ED_preview_free_dbase(void) { if (G_pr_main) - free_main(G_pr_main); + BKE_main_free(G_pr_main); if (G_pr_main_cycles) - free_main(G_pr_main_cycles); + BKE_main_free(G_pr_main_cycles); } static int preview_mat_has_sss(Material *mat, bNodeTree *ntree) |