diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:26:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:26:18 +0300 |
| commit | aabf4d407695d0f2dbac0baa55bf1631e408eda9 (patch) | |
| tree | 5ccb354f8f400cae37747f473dda6af6c15578d5 /intern | |
| parent | 5c75c8d8d0bdc24fef1450a4e40c676977217fb6 (diff) | |
| parent | 37889011070ff2ec52159690f652238d2b325185 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/openvdb/openvdb_util.cc | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 268b4e31d7d..e7292872e9c 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -106,6 +106,7 @@ if(WITH_OPENSUBDIV) data_to_c_simple(shader/gpu_shader_opensubdiv_fragment.glsl SRC) add_definitions(-DGLEW_STATIC) + add_definitions(-DOSD_USES_GLEW) if(WIN32) add_definitions(-DNOMINMAX) diff --git a/intern/openvdb/openvdb_util.cc b/intern/openvdb/openvdb_util.cc index a221a537851..899b41ff09b 100644 --- a/intern/openvdb/openvdb_util.cc +++ b/intern/openvdb/openvdb_util.cc @@ -27,5 +27,10 @@ ScopeTimer::ScopeTimer(const std::string &message) : m_message(message), m_timer ScopeTimer::~ScopeTimer() { - std::printf("%s: %fms\n", m_message.c_str(), m_timer.delta()); +#if OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER >= 7 + double delta = m_timer.milliseconds(); +#else + double delta = m_timer.delta(); /* Deprecated in OpenVDB 7. */ +#endif + std::printf("%s: %fms\n", m_message.c_str(), delta); } |