diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 21:15:14 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 21:15:41 +0400 |
commit | 63b981bf9bae1ad6c3929a32107dcb09caf1ec45 (patch) | |
tree | 1c8aff2406cf1b1ce8d613ba58d720148188da50 /source/blender/blenkernel | |
parent | ef2a38a9665c3f39ccdead8e1177f9b9c2e92538 (diff) |
Changing render engine now refreshes the texture paint display better.
Also avoid looping over all objects for texture paint checks when a
material changes, only check active object.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 13 |
3 files changed, 5 insertions, 20 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 9c85c4eab95..2f20505bea3 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -88,7 +88,6 @@ bool object_remove_material_slot(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); -void BKE_texpaint_slots_clear(struct Material *ma); /* rna api */ void BKE_material_resize_id(struct ID *id, short totcol, bool do_id_user); diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 895e542ca52..eecc04c1e72 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2497,12 +2497,11 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id) } if (ELEM(idtype, ID_MA, ID_TE)) { - for (obt = bmain->object.first; obt; obt = obt->id.next) { - if (obt->mode & OB_MODE_TEXTURE_PAINT) { - obt->recalc |= OB_RECALC_DATA; - BKE_texpaint_slots_refresh_object(sce, obt); - lib_id_recalc_data_tag(bmain, &obt->id); - } + obt = sce->basact ? sce->basact->object : NULL; + if (obt && obt->mode & OB_MODE_TEXTURE_PAINT) { + obt->recalc |= OB_RECALC_DATA; + BKE_texpaint_slots_refresh_object(sce, obt); + lib_id_recalc_data_tag(bmain, &obt->id); } } diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 81b93a47917..7565703358e 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1307,19 +1307,6 @@ bool object_remove_material_slot(Object *ob) return true; } -void BKE_texpaint_slots_clear(struct Material *ma) -{ - - if (ma->texpaintslot) { - MEM_freeN(ma->texpaintslot); - ma->texpaintslot = NULL; - } - ma->tot_slots = 0; - ma->paint_active_slot = 0; - ma->paint_clone_slot = 0; -} - - static bool get_mtex_slot_valid_texpaint(struct MTex *mtex) { return (mtex && (mtex->texco == TEXCO_UV) && |