diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-07-22 14:35:40 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-07-22 14:35:40 +0300 |
commit | 679113fbd5ecef72850b572535534ffde1f03f11 (patch) | |
tree | 38ab7d04759ddf86a999938504a0346dfdd9e51a /source/blender/draw/engines/eevee/eevee_materials.c | |
parent | 65d2374c806ecf42ccf106cd28380e7a7071f789 (diff) |
Basic drawing code for hair edit mode in the new 2.8 draw engine system.
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_materials.c')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 46ed858603d..2f01a5fd966 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1046,7 +1046,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_SceneLayerData *sl } if (ob->type == OB_MESH) { - if (ob != draw_ctx->scene->obedit) { + if (ob != draw_ctx->scene->obedit && !(ob->mode & OB_MODE_HAIR_EDIT)) { material_hash = stl->g_data->hair_material_hash; for (ModifierData *md = ob->modifiers.first; md; md = md->next) { |