diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-04-23 19:26:22 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-04-23 19:26:22 +0300 |
| commit | 7d98dfd6bb3921e661f5ba5adb04ffd9876395f1 (patch) | |
| tree | c97fc60a92a7966bb59edb23e3e8400aad5591be /source/blender/blenkernel/intern/material.c | |
| parent | 5e045485009c93d845ff0295066aa45297c1bc1a (diff) | |
| parent | 0fbcb824d0ff1673ad186055a472b977406fb61d (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index b3fb9681918..8d21a869907 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1624,11 +1624,13 @@ void BKE_material_eval(struct Depsgraph *depsgraph, Material *material) * default shader nodes. */ static Material default_material_empty; +static Material default_material_holdout; static Material default_material_surface; static Material default_material_volume; static Material default_material_gpencil; static Material *default_materials[] = {&default_material_empty, + &default_material_holdout, &default_material_surface, &default_material_volume, &default_material_gpencil, @@ -1695,6 +1697,11 @@ Material *BKE_material_default_empty(void) return &default_material_empty; } +Material *BKE_material_default_holdout(void) +{ + return &default_material_holdout; +} + Material *BKE_material_default_surface(void) { return &default_material_surface; |