diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
| commit | aae0598aa233d43d0ffc81a070b2ce20d6871c1d (patch) | |
| tree | 378100f45cf1db972c671a6886496a5604f7ab29 /source/blender/blenkernel/intern/CCGSubSurf_intern.h | |
| parent | 95d7d3c2a6aa91f1dcb33ff0cdfc751e2886d8cd (diff) | |
| parent | d7e4f920fd93a4ae5679e0eb6b228a349ab3b082 (diff) | |
Merge branch 'master' into temp_depsgraph_split_ubereval
Diffstat (limited to 'source/blender/blenkernel/intern/CCGSubSurf_intern.h')
| -rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf_intern.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index e2b42065382..7ec9f329444 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -303,6 +303,16 @@ void ccgSubSurf__sync_legacy(CCGSubSurf *ss); void ccgSubSurf__sync_opensubdiv(CCGSubSurf *ss); +/* Delayed free routines. Will do actual free if called from + * main thread and schedule free for later free otherwise. + */ + +#ifdef WITH_OPENSUBDIV +void ccgSubSurf__delete_osdGLMesh(struct OpenSubdiv_GLMesh *osd_mesh); +void ccgSubSurf__delete_vertex_array(unsigned int vao); +void ccgSubSurf__delete_pending(void); +#endif + /* * CCGSubSurf_opensubdiv_converter.c * */ struct OpenSubdiv_Converter; |