griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.4-release'

Browse Source
This commit is contained in:
Miguel Pozo
2022-11-27 14:41:36 +01:00
parent 3ccf4a3944 6cd441fdac
commit ea384fc096
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/intern/draw_cache_impl_subdivision.cc
View File

@@ -113,7 +113,8 @@ static const char *get_shader_code(int shader_type)
case SHADER_BUFFER_NORMALS_ACCUMULATE: {
return datatoc_common_subdiv_normals_accumulate_comp_glsl;
}
case SHADER_BUFFER_NORMALS_FINALIZE: {
case SHADER_BUFFER_NORMALS_FINALIZE:
case SHADER_BUFFER_CUSTOM_NORMALS_FINALIZE: {
return datatoc_common_subdiv_normals_finalize_comp_glsl;
}
case SHADER_PATCH_EVALUATION:
@@ -289,11 +290,11 @@ static GPUShader *get_subdiv_shader(int shader_type)
if (ELEM(shader_type,
SHADER_BUFFER_LINES,
SHADER_BUFFER_LNOR,
SHADER_BUFFER_TRIS,
SHADER_BUFFER_TRIS_MULTIPLE_MATERIALS,
SHADER_BUFFER_UV_STRETCH_AREA)) {
defines = "#define SUBDIV_POLYGON_OFFSET\n";
}
else if (shader_type == SHADER_BUFFER_TRIS_MULTIPLE_MATERIALS) {
else if (shader_type == SHADER_BUFFER_TRIS) {
defines =
"#define SUBDIV_POLYGON_OFFSET\n"
"#define SINGLE_MATERIAL\n";