diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-28 16:09:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-28 21:17:16 +0300 |
| commit | da1323d1c95095feff98e8aa054d73fd323c363d (patch) | |
| tree | 021ec89b4a50696ba8b6ae02df82f278354812cf /source/blender/editors/render/render_update.c | |
| parent | acd462347196fef9450115f28ac2594cb12b0226 (diff) | |
Fix T60366: texture paint slots not updating when editing material.
Now always refresh when the material changes. Depsgraph tag moved out
of the refresh function since that gets called on depsgraph update,
which should not trigger a second depsgraph update.
Diffstat (limited to 'source/blender/editors/render/render_update.c')
| -rw-r--r-- | source/blender/editors/render/render_update.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 462fd997fc5..6e6154e638a 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -206,6 +206,8 @@ void ED_render_engine_changed(Main *bmain) static void material_changed(Main *UNUSED(bmain), Material *ma) { + BKE_texpaint_slot_refresh_cache(ma); + /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&ma->id)); } @@ -266,7 +268,7 @@ static void scene_changed(Main *bmain, Scene *scene) /* glsl */ for (ob = bmain->object.first; ob; ob = ob->id.next) { if (ob->mode & OB_MODE_TEXTURE_PAINT) { - BKE_texpaint_slots_refresh_object(scene, ob); + BKE_texpaint_slots_refresh_object(ob); BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); } } |