ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix T79509 Workbench: Object color mode broken if more than 4096 objects

Browse source 
This was due to the new DRWShadingGroup not being saved and reused for
the next objects.
This commit is contained in:
Clément Foucault 2020-08-05 19:27:44 +02:00 • committed by Jeroen Bakker
parent 0122615d36
commit c15352dd67
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/blender/draw/engines/workbench/workbench_materials.c
View file

@ -228,15 +228,15 @@ DRWShadingGroup *workbench_material_setup_ex(WORKBENCH_PrivateData *wpd,
workbench_material_ubo_data(wpd, ob, NULL, &wpd->material_ubo_data_curr[mat_id], color_type);
const bool transp = wpd->shading.xray_alpha < 1.0f || ob->color[3] < 1.0f;
DRWShadingGroup *grp = wpd->prepass[transp][infront][hair].common_shgrp;
DRWShadingGroup **grp = &wpd->prepass[transp][infront][hair].common_shgrp;
if (resource_changed) {
grp = DRW_shgroup_create_sub(grp);
DRW_shgroup_uniform_block(grp, "material_block", wpd->material_ubo_curr);
*grp = DRW_shgroup_create_sub(*grp);
DRW_shgroup_uniform_block(*grp, "material_block", wpd->material_ubo_curr);
}
if (r_transp && transp) {
*r_transp = true;
}
return grp;
return *grp;
}
}
}