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

Fix #29369: bpy.data.curves.new(name= "test" , type = 'SURFACE') does not create a surface

Browse Source 
This issue it totally related on issue with changing object datablock.
For curves it used to guess object type from curve datablock based on
count of control points in V direction.
This quess fails in case when SurfCircle datablock is trying to be reused
by another surface object or as another sample empty surface databouck used
to be treated as curve.

Store type in Curve when creating new Curve datablock which is used in
this object type quessing function.

Note: Previously saved files wouldn't change behavior at all.
This commit is contained in:
Sergey Sharybin 2011-11-24 14:30:37 +00:00
parent c1c3d66079
commit 5acde0d24c
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/curve.c
View File

@ -169,6 +169,7 @@ Curve *add_curve(const char *name, int type)
cu->texflag= CU_AUTOSPACE;
cu->smallcaps_scale= 0.75f;
cu->twist_mode= CU_TWIST_MINIMUM; // XXX: this one seems to be the best one in most cases, at least for curve deform...
cu->type= type;
cu->bb= unit_boundbox();
@ -303,16 +304,23 @@ ListBase *curve_editnurbs(Curve *cu)
short curve_type(Curve *cu)
{
Nurb *nu;
int type= cu->type;
if(cu->vfont) {
return OB_FONT;
}
for (nu= cu->nurb.first; nu; nu= nu->next) {
if(nu->pntsv>1) {
return OB_SURF;
if(!cu->type) {
type= OB_CURVE;
for (nu= cu->nurb.first; nu; nu= nu->next) {
if(nu->pntsv>1) {
type= OB_SURF;
}
}
}
return OB_CURVE;
return type;
}
void update_curve_dimension(Curve *cu)

1
source/blender/editors/object/object_add.c
View File

@ -1366,6 +1366,7 @@ static int convert_exec(bContext *C, wmOperator *op)
makeDispListCurveTypes(scene, newob, 0);
newob->type= OB_CURVE;
cu->type= OB_CURVE;
if(cu->vfont) {
cu->vfont->id.us--;

4
source/blender/makesdna/DNA_curve_types.h
View File

@ -186,7 +186,9 @@ typedef struct Curve {
float size[3];
float rot[3];
short texflag, pad1; /* keep a short because of give_obdata_texspace() */
short type; /* creation-time type of curve datablock */
short texflag; /* keep a short because of give_obdata_texspace() */
short drawflag, twist_mode;
float twist_smooth, smallcaps_scale;