diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-04-20 13:20:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-20 13:20:33 +0300 |
commit | 437f69ab4593785743c99c1e116f7f9380642f3d (patch) | |
tree | 724144eb928c9cfb0d999dce69e990358a3d4d1c /source/blender/blenkernel/intern/material.c | |
parent | 9b4c8a25076fcba566997137140fd23166d52654 (diff) |
Allow Python overrides for materials.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index b5b7f3d06aa..c7e6b3ba1b3 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -806,9 +806,13 @@ void assign_material_id(ID *id, Material *ma, short act) if (act > MAXMAT) return; if (act < 1) act = 1; + /* this is needed for Python overrides, + * we just have to take care that the UI can't do this */ +#if 0 /* prevent crashing when using accidentally */ BLI_assert(id->lib == NULL); if (id->lib) return; +#endif /* test arraylens */ |