diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-08-05 12:39:25 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-08-05 12:39:25 +0400 |
commit | 5f77852a479952560cbbcccab6fcf07b4fd9c0b2 (patch) | |
tree | 78415a2cd7d5f55d10261d8fa964d1ff4a847595 /source/blender/blenkernel/intern/curve.c | |
parent | a0cece42c646df39c858223b0361b7dfe0d44dd8 (diff) |
Do not reset bevel/taper object when they've got incorrect type - just do
noting in makebevelcurve and calc_taper functions if type is not curve.
This avoids DNA changing depended on object recalc.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index d87a49496ec..ce43f082688 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1222,6 +1222,8 @@ void makebevelcurve(Scene *scene, Object *ob, ListBase *disp, int forRender) // XXX if( ob == obedit && ob->type == OB_FONT ) return; if(cu->bevobj) { + if (cu->bevobj->type!=OB_CURVE) return; + bevcu= cu->bevobj->data; if(bevcu->ext1==0.0 && bevcu->ext2==0.0) { ListBase bevdisp= {NULL, NULL}; |