diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-03-16 05:55:42 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-03-16 05:55:42 +0300 |
| commit | 7d2703c805f3c9db29d85f1d4b7aaaaba0b2b4dc (patch) | |
| tree | 5cbea85aab6702b775fc4318bbe6483e7a56cc14 /source/blender/blenkernel | |
| parent | 1e1b88c118d6e6b2df3f6240547acc92e2d08e15 (diff) | |
| parent | 54a55827ecee7f25d6a52255d8a639498a678fa6 (diff) | |
Merging etch-a-ton branch in trunk.
Slightly out of date documentation in wiki, I'll be updating that tomorrow.
http://wiki.blender.org/index.php/User:Theeth/etch-a-ton
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a25afeafaef..0b153c3c065 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -521,6 +521,7 @@ void unlink_object(Object *ob) while(sce) { if(sce->id.lib==NULL) { if(sce->camera==ob) sce->camera= NULL; + if(sce->toolsettings->skgen_template==ob) sce->toolsettings->skgen_template = NULL; } sce= sce->id.next; } |