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/material.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/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index a0059a99473..2971f56c775 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -261,6 +261,10 @@ void BKE_material_copy_data(Main *bmain, Material *ma_dst, const Material *ma_sr ma_dst->preview = NULL; } + if (ma_src->texpaintslot != NULL) { + ma_dst->texpaintslot = MEM_dupallocN(ma_src->texpaintslot); + } + BLI_listbase_clear(&ma_dst->gpumaterial); /* TODO Duplicate Engine Settings and set runtime to NULL */ |