diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-20 13:33:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-20 13:33:59 +0300 |
| commit | 04b8b1a167c332937a244fb88340d60fa9182efd (patch) | |
| tree | f4ca72a1049bd5c75acfeb8f99487747e46cff95 /source/blender/blenkernel/intern/library_query.c | |
| parent | 1662c514c01f0b85f67e8d52bebc6abce47cb8b4 (diff) | |
| parent | 60ff803998360c8a83c3f740342c44124ec277ff (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/library_query.c
Diffstat (limited to 'source/blender/blenkernel/intern/library_query.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 27a2916ef92..bed2244702f 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -673,6 +673,9 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call } CALLBACK_INVOKE(material->group, IDWALK_CB_USER); CALLBACK_INVOKE(material->edit_image, IDWALK_CB_USER); + if (material->texpaintslot != NULL) { + CALLBACK_INVOKE(material->texpaintslot->ima, IDWALK_CB_NOP); + } break; } |