Commit: cdfeebd1393d611c13fa18fabd72f147d5ef5012
Author: Sybren A. Stüvel
Date:   Wed Aug 9 11:44:22 2017 +0200
Branches: master
https://developer.blender.org/rBcdfeebd1393d611c13fa18fabd72f147d5ef5012

Alembic: Renamed variable assigned_name → assigned_mat

The variable is a pointer to a Material, not to a name/string.

===================================================================

M       source/blender/alembic/intern/abc_mesh.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_mesh.cc 
b/source/blender/alembic/intern/abc_mesh.cc
index 9a4ca6f99a8..7949a371283 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);
                }
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to