archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T62328, T62209: revert recent fix for texture slots updates (T60366).

Browse Source 
This causes other issues, revert for now until a better fix is found.
Reverts commit da1323d1c9.
This commit is contained in:
Brecht Van Lommel
2019-03-07 19:39:50 +01:00
parent 8ca43a0c7b
commit a261d6f2d3
8 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/render/render_update.c
View File

@@ -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);
}
}