fclem/blender
2
1
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

GPU: Shader Create Info GLSL-C++ stubs #3

Closed
Clément Foucault wants to merge 90 commits from create-info-cpp-macros into glsl-include
pull from: create-info-cpp-macros
merge into: fclem:glsl-include

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 90 Files Changed 158 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 72944075e8 - Show all commits

2
source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh
View File

@ -80,6 +80,6 @@ GPU_SHADER_CREATE_INFO(basic_depth)
FRAGMENT_SOURCE("basic_depth_frag.glsl") FRAGMENT_SOURCE("basic_depth_frag.glsl")
GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_END()
BASIC_OBTYPE_VARIATIONS(basic_depth, basic_depth, draw_globals); BASIC_OBTYPE_VARIATIONS(basic_depth, basic_depth, draw_globals)
/** \} */ /** \} */