[Bf-blender-cvs] [00b009ca745] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 00b009ca7453c1b4571af16daa37987e4391fe3e
Author: Sergey Sharybin
Date:   Wed Jun 7 12:18:07 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB00b009ca7453c1b4571af16daa37987e4391fe3e

Merge branch 'master' into blender2.8

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



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

diff --cc intern/opensubdiv/opensubdiv_capi.cc
index 8337bcb0ce5,91803551f12..aed5d4fbd14
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@@ -368,3 -369,21 +369,8 @@@ const struct OpenSubdiv_TopologyRefiner
  {
  	return gl_mesh->topology_refiner;
  }
+ 
 -int openSubdiv_supportGPUDisplay(void)
 -{
 -	// TODO: simplify extension check once Blender adopts GL 3.2
 -	return openSubdiv_gpu_legacy_support() &&
 -	       (GLEW_VERSION_3_2 ||
 -	       (GLEW_VERSION_3_1 && GLEW_EXT_geometry_shader4) ||
 -	       (GLEW_VERSION_3_0 &&
 -	        GLEW_EXT_geometry_shader4 &&
 -	        GLEW_ARB_uniform_buffer_object &&
 -	        (GLEW_ARB_texture_buffer_object || GLEW_EXT_texture_buffer_object)));
 -	/* also ARB_explicit_attrib_location? */
 -}
 -
+ int openSubdiv_getVersionHex(void)
+ {
+ 	return OPENSUBDIV_VERSION_NUMBER;
+ }
diff --cc intern/opensubdiv/opensubdiv_capi.h
index 3fdfefd525f,281bd3f010d..2c3fcee7dbb
--- a/intern/opensubdiv/opensubdiv_capi.h
+++ b/intern/opensubdiv/opensubdiv_capi.h
@@@ -146,10 -146,14 +146,12 @@@ void openSubdiv_osdGLAllocFVar(struct O
  void openSubdiv_osdGLDestroyFVar(OpenSubdiv_GLMesh *gl_mesh);
  
  /* ** Utility functions ** */
 -int openSubdiv_supportGPUDisplay(void);
  int openSubdiv_getAvailableEvaluators(void);
 -void openSubdiv_init(bool gpu_legacy_support);
 +void openSubdiv_init(void);
  void openSubdiv_cleanup(void);
 -bool openSubdiv_gpu_legacy_support(void);
  
+ int openSubdiv_getVersionHex(void);
+ 
  #ifdef __cplusplus
  }
  #endif