Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
ef687bd7c2
|
@ -122,7 +122,7 @@ void EEVEE_cache_populate(void *vedata, Object *ob)
|
|||
}
|
||||
|
||||
if (DRW_object_is_renderable(ob) && (ob_visibility & OB_VISIBLE_SELF)) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_SURF, OB_MBALL)) {
|
||||
EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow);
|
||||
}
|
||||
else if (ob->type == OB_HAIR) {
|
||||
|
|
|
@ -820,7 +820,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
|
|||
!DRW_state_is_image_render();
|
||||
|
||||
/* First get materials for this mesh. */
|
||||
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_SURF, OB_MBALL)) {
|
||||
const int materials_len = DRW_cache_object_material_count_get(ob);
|
||||
|
||||
EeveeMaterialCache *matcache = BLI_array_alloca(matcache, materials_len);
|
||||
|
|
|
@ -240,7 +240,7 @@ void EEVEE_render_cache(void *vedata,
|
|||
}
|
||||
|
||||
if (ob_visibility & OB_VISIBLE_SELF) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_SURF, OB_MBALL)) {
|
||||
EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow);
|
||||
if (do_cryptomatte) {
|
||||
EEVEE_cryptomatte_cache_populate(data, sldata, ob);
|
||||
|
|
|
@ -379,7 +379,7 @@ void workbench_cache_populate(void *ved, Object *ob)
|
|||
return;
|
||||
}
|
||||
|
||||
if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_POINTCLOUD)) {
|
||||
if (ELEM(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_POINTCLOUD)) {
|
||||
bool use_sculpt_pbvh, use_texpaint_mode, draw_shadow, has_transp_mat = false;
|
||||
eV3DShadingColorType color_type = workbench_color_type_get(
|
||||
wpd, ob, &use_sculpt_pbvh, &use_texpaint_mode, &draw_shadow);
|
||||
|
|
Loading…
Reference in New Issue