Merge branch 'blender-v2.83-release'
authorSebastián Barschkis <sebbas@sebbas.org>
Tue, 19 May 2020 19:23:54 +0000 (21:23 +0200)
committerSebastián Barschkis <sebbas@sebbas.org>
Tue, 19 May 2020 19:23:54 +0000 (21:23 +0200)
1  2 
intern/mantaflow/intern/strings/liquid_script.h
intern/opensubdiv/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c

index ffebdd93492d8ab064f03d52928f1f91ba2c6240,c411e58be358865b0ca455ba0ed018f8aa72e736..06fa637eb322fee535bcdeb1b794cf665e5e8010
@@@ -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)