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/blenkernel/BKE_material.h | |
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/blenkernel/BKE_material.h')
-rw-r--r-- | source/blender/blenkernel/BKE_material.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 523a67eff67..c445408609c 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -55,6 +55,7 @@ struct Material *copy_material(struct Material *ma); struct Material *localize_material(struct Material *ma); struct Material *give_node_material(struct Material *ma); /* returns node material or self */ void make_local_material(struct Material *ma); +void extern_local_matarar(struct Material **matar, short totcol); void automatname(struct Material *); |