[Bf-blender-cvs] [1b34da5da63] blender-v3.4-release: Fix: OpenSubdiv reporting version 0.0.0 in system_info.txt

Ray Molenkamp noreply at git.blender.org
Sat Nov 12 21:32:00 CET 2022


Commit: 1b34da5da6390492c5114796d1e860214bd97e1c
Author: Ray Molenkamp
Date:   Sat Nov 12 13:31:55 2022 -0700
Branches: blender-v3.4-release
https://developer.blender.org/rB1b34da5da6390492c5114796d1e860214bd97e1c

Fix: OpenSubdiv reporting version 0.0.0 in system_info.txt

OSD Lists as 0, 0, 0 this is due to opensubdiv_capi.cc not actually including
the OSD version header, so it's not getting the version define, and the code
in openSubdiv_getVersionHex is really well prepared to deal with any or no
version at all of OSD, catches the problem and returns 0, 0, 0

Given this file is only build when OSD is enabled we can just blindly include
opensubdiv/version.h here

Reviewed by: brecht
Differential Revision: https://developer.blender.org/D16398

===================================================================

M	intern/opensubdiv/internal/base/opensubdiv_capi.cc

===================================================================

diff --git a/intern/opensubdiv/internal/base/opensubdiv_capi.cc b/intern/opensubdiv/internal/base/opensubdiv_capi.cc
index 40d820836b9..db302e3d5de 100644
--- a/intern/opensubdiv/internal/base/opensubdiv_capi.cc
+++ b/intern/opensubdiv/internal/base/opensubdiv_capi.cc
@@ -15,7 +15,7 @@
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #include "opensubdiv_capi.h"
-
+#include "opensubdiv/version.h"
 #ifdef _MSC_VER
 #  include <iso646.h>
 #endif



More information about the Bf-blender-cvs mailing list