blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

WIP: eevee-next-world-irradiance #108304

Closed
Jeroen Bakker wants to merge 79 commits from Jeroen-Bakker:eevee-next-world-irradiance into main
pull from: Jeroen-Bakker:eevee-next-world-irradiance
merge into: blender:main

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

10
source/blender/gpu/intern/gpu_shader_builder_stubs.cc
View File

@ -164,30 +164,30 @@ void BKE_material_defaults_free_gpu()
/** \name Stubs of BKE_customdata.h /** \name Stubs of BKE_customdata.h
* \{ */ * \{ */
int CustomData_get_offset(const struct CustomData * /*data*/, int /*type*/) int CustomData_get_offset(const struct CustomData * /*data*/, eCustomDataType /*type*/)
{ {
BLI_assert_unreachable(); BLI_assert_unreachable();
return 0; return 0;
} }
int CustomData_get_named_layer_index(const struct CustomData * /*data*/, int CustomData_get_named_layer_index(const struct CustomData * /*data*/,
int /*type*/, eCustomDataType /*type*/,
const char * /*name*/) const char * /*name*/)
{ {
return -1; return -1;
} }
int CustomData_get_active_layer_index(const struct CustomData * /*data*/, int /*type*/) int CustomData_get_active_layer_index(const struct CustomData * /*data*/, eCustomDataType /*type*/)
{ {
return -1; return -1;
} }
int CustomData_get_render_layer_index(const struct CustomData * /*data*/, int /*type*/) int CustomData_get_render_layer_index(const struct CustomData * /*data*/, eCustomDataType /*type*/)
{ {
return -1; return -1;
} }
bool CustomData_has_layer(const struct CustomData * /*data*/, int /*type*/) bool CustomData_has_layer(const struct CustomData * /*data*/, eCustomDataType /*type*/)
{ {
return false; return false;
} }