2.5

Two bugfixes:
- new WM_error() needed 'struct' in definition 
- fixed crash rrors reading files with curves.

3 files changed, 4 insertions, 3 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));
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index ca0cecc79a0..19ddd43f7ec 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -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);