diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-26 11:17:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-26 11:17:21 +0400 |
| commit | e4cc1c3f2c3e5a85fbf4f7f2757b09544dd556ee (patch) | |
| tree | 1d134f4085ba2d90e854c47848c6fc82704667bb /source/blender/editors/mesh | |
| parent | 461a7c5c8185d0504c63ddc8de0b2c765e72be4b (diff) | |
fix [#27178] Material links lost when making mesh data local
- making local object data - Curve/Mesh/MBall lost references to linked materials.
- joining a linked mesh object into a local one lost the link.
As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail.
- making local metaball didn't ensure unique ID name.
- make_local_armature() was missing check for object users - main body of code would never run.
- local particles didn't set the dupli-group or textures to extern.
checked all local functions for consistency/correctness.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index cf3ad26ec25..763e82b8b53 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -226,8 +226,9 @@ int join_mesh_exec(bContext *C, wmOperator *op) } if(b==totcol) { matar[b]= ma; - if(ma) - ma->id.us++; + if(ma) { + id_us_plus(&ma->id); + } totcol++; } if(totcol>=MAXMAT-1) |