diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-07 15:43:28 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-07 15:43:28 +0300 |
| commit | dc5367c97bfff8ccec939ffb3105dcc451b69dff (patch) | |
| tree | 0a5085b4511ac73db8e2d13673aec9138d151a63 /source/blender/alembic/intern/abc_mesh.cc | |
| parent | 4789c5ca6d0317a4d1745bec454319ead99f20b1 (diff) | |
| parent | 8c5826f59a37924866ed7dd5bda7fb39c44e8227 (diff) | |
Merge branch 'master' into cycles_split_kernelcycles_split_kernel
Diffstat (limited to 'source/blender/alembic/intern/abc_mesh.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 8bc9c335054..5a57e43326a 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -691,7 +691,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string assigned_name = mat_iter->second; } - assign_material(ob, assigned_name, it->second, BKE_MAT_ASSIGN_OBJECT); + assign_material(ob, assigned_name, it->second, BKE_MAT_ASSIGN_OBDATA); } } } |