kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

2.5

Browse Source 
Two bugfixes:
- new WM_error() needed 'struct' in definition 
- fixed crash rrors reading files with curves.
This commit is contained in:
Ton Roosendaal 2008-12-19 18:48:41 +00:00
parent a3d3619898
commit 12ad72ba8f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/anim.c
View File

@ -99,7 +99,8 @@ void calc_curvepath(Object *ob)
if(ob==NULL || ob->type != OB_CURVE) return; if(ob==NULL || ob->type != OB_CURVE) return;
cu= ob->data; cu= ob->data;
//XXX if(ob==G.obedit) nu= editNurb.first; //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); if(cu->path) free_path(cu->path);
cu->path= NULL; cu->path= NULL;

2
source/blender/blenkernel/intern/displist.c
View File

@ -1455,7 +1455,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco)
float (*originalVerts)[3]; float (*originalVerts)[3];
float (*deformedVerts)[3]; float (*deformedVerts)[3];
int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE); 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; int numVerts;
BLI_freelistN(&(cu->bev)); BLI_freelistN(&(cu->bev));

2
source/blender/windowmanager/WM_api.h
View File

@ -110,7 +110,7 @@ int WM_operator_confirm (struct bContext *C, struct wmOperator *op, struct wm
int WM_operator_winactive (struct bContext *C); int WM_operator_winactive (struct bContext *C);
/* default error box */ /* default error box */
void WM_error(bContext *C, char *str); void WM_error(struct bContext *C, char *str);
/* operator api */ /* operator api */
wmOperatorType *WM_operatortype_find(const char *idname); wmOperatorType *WM_operatortype_find(const char *idname);