diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-09 12:44:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-17 16:40:44 +0300 |
| commit | 455c016ba61695966342c38002a18e5356da6c8f (patch) | |
| tree | 0b8276263aa3f3b0af68c916f6aae7e2692e3f04 /source/blender | |
| parent | 6e7d9621180ac4b48c026defea3c1fd4f132f8ac (diff) | |
Alembic: Renamed variable assigned_name → assigned_mat
The variable is a pointer to a Material, not to a name/string.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 7acb8ed345c..a3b36a896a7 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -681,17 +681,17 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string std::string mat_name = it->first; mat_iter = mat_map.find(mat_name.c_str()); - Material *assigned_name; + Material *assigned_mat; if (mat_iter == mat_map.end()) { - assigned_name = BKE_material_add(bmain, mat_name.c_str()); - mat_map[mat_name] = assigned_name; + assigned_mat = BKE_material_add(bmain, mat_name.c_str()); + mat_map[mat_name] = assigned_mat; } else { - assigned_name = mat_iter->second; + assigned_mat = mat_iter->second; } - assign_material(ob, assigned_name, it->second, BKE_MAT_ASSIGN_OBDATA); + assign_material(ob, assigned_mat, it->second, BKE_MAT_ASSIGN_OBDATA); } } } |