diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-06 15:05:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-06 15:36:39 +0300 |
| commit | 62ca9bcd0a7ff6fe52e359521369fc8b063d082a (patch) | |
| tree | 7aae08f2a67b3ca12e01e524e3759ae226adf936 /source/blender/draw | |
| parent | dd00e8ecd642cafc6294ec7f0f31c5e0e0fe9870 (diff) | |
Cleanup: refactor default materials and shader nodes
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 6da7621c6c7..c114ca57f05 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1430,12 +1430,12 @@ static void material_transparent(Material *ma, DRW_shgroup_state_enable(*shgrp, cur_state); } -/* Return correct material or &defmaterial if slot is empty. */ +/* Return correct material or empty default material if slot is empty. */ BLI_INLINE Material *eevee_object_material_get(Object *ob, int slot) { Material *ma = BKE_object_material_get(ob, slot + 1); if (ma == NULL) { - ma = &defmaterial; + ma = BKE_material_default_empty(); } return ma; } |