diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-07 21:39:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-07 21:41:05 +0300 |
| commit | a261d6f2d3feb80efb51b27aa7cae56ea6c4c57d (patch) | |
| tree | 9d80597e6436f0e5f8f4eaa97cfe1eb22d8f4e8f /source/blender/editors/render | |
| parent | 8ca43a0c7b140fd40185b27e52884e5b79d79346 (diff) | |
Fix T62328, T62209: revert recent fix for texture slots updates (T60366).
This causes other issues, revert for now until a better fix is found.
Reverts commit da1323d1c95095feff98e8aa054d73fd323c363d.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_update.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 6e6154e638a..462fd997fc5 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -206,8 +206,6 @@ 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)); } @@ -268,7 +266,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(ob); + BKE_texpaint_slots_refresh_object(scene, ob); BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); } } |