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/blenkernel/BKE_material.h
View File

@@ -83,8 +83,8 @@ bool BKE_object_material_slot_remove(struct Main *bmain, struct Object *ob);
struct MaterialGPencilStyle *BKE_material_gpencil_settings_get(struct Object *ob, short act);
void BKE_texpaint_slot_refresh_cache(struct Material *ma);
void BKE_texpaint_slots_refresh_object(struct Object *ob);
void BKE_texpaint_slot_refresh_cache(struct Scene *scene, struct Material *ma);
void BKE_texpaint_slots_refresh_object(struct Scene *scene, struct Object *ob);
/* rna api */
void BKE_material_resize_id(struct Main *bmain, struct ID *id, short totcol, bool do_id_user);