Commit: e73d7d27dc667e726b2e8c8874c3596e86e622cf Author: Sebastián Barschkis Date: Tue May 19 21:23:54 2020 +0200 Branches: master https://developer.blender.org/rBe73d7d27dc667e726b2e8c8874c3596e86e622cf
Merge branch 'blender-v2.83-release' =================================================================== =================================================================== diff --cc intern/opensubdiv/CMakeLists.txt index ffebdd93492,c411e58be35..06fa637eb32 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@@ -90,8 -101,12 +90,12 @@@ if(WITH_OPENSUBDIV OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_COMPUTE) - add_definitions(-DGLEW_STATIC) + data_to_c_simple(shader/gpu_shader_opensubdiv_vertex.glsl SRC) + data_to_c_simple(shader/gpu_shader_opensubdiv_geometry.glsl SRC) + data_to_c_simple(shader/gpu_shader_opensubdiv_fragment.glsl SRC) + - add_definitions(-DOSD_USES_GLEW) + add_definitions(${GL_DEFINITIONS}) + add_definitions(-DOSD_USES_GLEW) if(WIN32) add_definitions(-DNOMINMAX) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs