diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
| commit | e76ff4df4123b5517599930629dbcf0507b582e9 (patch) | |
| tree | 3cf9a67f3a3a05c678f39a04533da81f56e66c02 /intern/opensubdiv/internal/opensubdiv.cc | |
| parent | 15dd6cb66887eb83fcc3ecf44c3b42a53161e390 (diff) | |
| parent | 528f0b95c4462b2e429600a566ca0434c90310f6 (diff) | |
Merge branch 'master' into tmp-widget-optitmp-widget-opti
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
Diffstat (limited to 'intern/opensubdiv/internal/opensubdiv.cc')
| -rw-r--r-- | intern/opensubdiv/internal/opensubdiv.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/opensubdiv/internal/opensubdiv.cc b/intern/opensubdiv/internal/opensubdiv.cc index 74b81b13351..e9f6086851b 100644 --- a/intern/opensubdiv/internal/opensubdiv.cc +++ b/intern/opensubdiv/internal/opensubdiv.cc @@ -24,7 +24,6 @@ #include "opensubdiv_device_context_cuda.h" #include "opensubdiv_device_context_opencl.h" -#include "opensubdiv_gl_mesh_capi.h" void openSubdiv_init(void) { @@ -34,7 +33,6 @@ void openSubdiv_init(void) void openSubdiv_cleanup(void) { - openSubdiv_deinitGLMeshDrawingResources(); } int openSubdiv_getAvailableEvaluators(void) @@ -86,7 +84,7 @@ int openSubdiv_getVersionHex(void) } int major = 0, minor = 0, patch = 0; vector<string> tokens; - opensubdiv_capi::stringSplit(&tokens, version, "_", true); + blender::opensubdiv::stringSplit(&tokens, version, "_", true); if (tokens.size() == 3) { major = atoi(tokens[0].c_str()); minor = atoi(tokens[1].c_str()); |