diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-19 21:48:41 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-19 21:48:41 +0300 |
commit | 12ad72ba8f4ab598c558428567707413e208eac7 (patch) | |
tree | 0de8a605541e28a91510af9f8441d9f848307bc8 /source/blender/blenkernel | |
parent | a3d3619898f541b989bedca67ffc8592892ac4dc (diff) |
2.5
Two bugfixes:
- new WM_error() needed 'struct' in definition
- fixed crash rrors reading files with curves.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index aeddabf8c1b..a32737762be 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -99,7 +99,8 @@ void calc_curvepath(Object *ob) if(ob==NULL || ob->type != OB_CURVE) return; cu= ob->data; //XXX if(ob==G.obedit) nu= editNurb.first; - //XXX else nu= cu->nurb.first; + //XXX else + nu= cu->nurb.first; if(cu->path) free_path(cu->path); cu->path= NULL; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 84025204ee4..c71664d09a7 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1455,7 +1455,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco) float (*originalVerts)[3]; float (*deformedVerts)[3]; int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE); - ListBase *nubase; //XXX ListBase *nubase = obedit?&editNurb:&cu->nurb; + ListBase *nubase= &cu->nurb; //XXX ListBase *nubase = obedit?&editNurb:&cu->nurb; int numVerts; BLI_freelistN(&(cu->bev)); |