[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17957] branches/blender2.5/blender/source /blender: 2.5

[Ton Roosendaal]

Revision: 17957
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17957
Author:   ton
Date:     2008-12-19 19:48:41 +0100 (Fri, 19 Dec 2008)

Log Message:
-----------
2.5

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

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
    branches/blender2.5/blender/source/blender/windowmanager/WM_api.h

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c	2008-12-19 18:28:37 UTC (rev 17956)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c	2008-12-19 18:48:41 UTC (rev 17957)
@@ -99,7 +99,8 @@
 	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;

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c	2008-12-19 18:28:37 UTC (rev 17956)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c	2008-12-19 18:48:41 UTC (rev 17957)
@@ -1455,7 +1455,7 @@
 		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));

Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/WM_api.h	2008-12-19 18:28:37 UTC (rev 17956)
+++ branches/blender2.5/blender/source/blender/windowmanager/WM_api.h	2008-12-19 18:48:41 UTC (rev 17957)
@@ -110,7 +110,7 @@
 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);