2.5
authorTon Roosendaal <ton@blender.org>
Fri, 19 Dec 2008 18:48:41 +0000 (18:48 +0000)
committerTon Roosendaal <ton@blender.org>
Fri, 19 Dec 2008 18:48:41 +0000 (18:48 +0000)
Two bugfixes:
- new WM_error() needed 'struct' in definition
- fixed crash rrors reading files with curves.

source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/displist.c
source/blender/windowmanager/WM_api.h

index aeddabf8c1bd6adf22ba474885ee6d7cc8048181..a32737762bedf87c546068ed204e192957b424e1 100644 (file)
@@ -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;
index 84025204ee45225fe6187f5911c9b0761b15d66d..c71664d09a734a9cdb583815d53f1765028cb10b 100644 (file)
@@ -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));
index ca0cecc79a07f42eea91d1da26c631fdadabe8fc..19ddd43f7ecf2ce6c9e1d19135cfde646cb237d6 100644 (file)
@@ -110,7 +110,7 @@ int                 WM_operator_confirm             (struct bContext *C, struct wmOperator *op, struct wm
 int                    WM_operator_winactive   (struct bContext *C);
        
                        /* default error box */
-void           WM_error(bContext *C, char *str);
+void           WM_error(struct bContext *C, char *str);
 
                        /* operator api */
 wmOperatorType *WM_operatortype_find(const char *idname);