diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
| commit | 22a1ad61f93a4b060500e5295c58b128f24a2daf (patch) | |
| tree | 5693c7acd41e5d325cf3f6f1675cbceb232dd8a4 /source/blender/editors/mesh/meshtools.c | |
| parent | a115c02605b2692710f5d9b64d87407b7ca5b374 (diff) | |
| parent | 937c5494c4933c65635450e66aeacffed74939f2 (diff) | |
svn merge ^/trunk/blender -r42372:42416
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index c74a994b9b6..4fcc2071d26 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -548,7 +548,6 @@ int join_mesh_exec(bContext *C, wmOperator *op) MEM_freeN(matar); ob->totcol= me->totcol= totcol; - ob->colbits= 0; if (matmap) MEM_freeN(matmap); |