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/blenkernel/BKE_material.h | |
| 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/blenkernel/BKE_material.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_material.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 84760a522f3..1c171ef6e7c 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -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); |