diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/render/extern/include/RE_pipeline.h | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/render/extern/include/RE_pipeline.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 6c64545a8c7..81878e74f39 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -165,6 +165,8 @@ void RE_InitRenderCB(struct Render *re); void RE_FreeRender (struct Render *re); /* only called on exit */ void RE_FreeAllRender (void); +/* only call on file load */ +void RE_FreeAllRenderResults(void); /* get results and statistics */ void RE_FreeRenderResult(struct RenderResult *rr); |