Revision: 31241
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31241
Author: nazgul
Date: 2010-08-11 17:37:09 +0200 (Wed, 11 Aug 2010)
Log Message:
-----------
- Remove debug printf
- Safety check pointer for nurbanaSizeChanged
- Fixed rna resolution_u crash
- Commented out isolines temporarily
Merged rev26323 from nurbs25 branch
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26323
Modified Paths:
--------------
branches/nurbs-merge/source/blender/blenkernel/intern/curve.c
branches/nurbs-merge/source/blender/blenkernel/intern/displist.c
branches/nurbs-merge/source/blender/makesrna/intern/rna_curve.c
Modified: branches/nurbs-merge/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/nurbs-merge/source/blender/blenkernel/intern/curve.c
2010-08-11 15:36:47 UTC (rev 31240)
+++ branches/nurbs-merge/source/blender/blenkernel/intern/curve.c
2010-08-11 15:37:09 UTC (rev 31241)
@@ -833,12 +833,14 @@
}
void nurbanaSizeChanged(Nurb *nu)
{
- NRB_SizeChanged(nu->nurbanaPtr,nu->pntsu,nu->pntsv);
+ if(nu->nurbanaPtr)
+ NRB_SizeChanged(nu->nurbanaPtr,nu->pntsu,nu->pntsv);
}
void nurbanaResetIsoLines(Nurb *nu)
{
- NRB_resetIsoLines(nu->nurbanaPtr);
+ if(nu->nurbanaPtr)
+ NRB_resetIsoLines(nu->nurbanaPtr);
}
void nurbana3dmRead(char *str)
Modified: branches/nurbs-merge/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/nurbs-merge/source/blender/blenkernel/intern/displist.c
2010-08-11 15:36:47 UTC (rev 31240)
+++ branches/nurbs-merge/source/blender/blenkernel/intern/displist.c
2010-08-11 15:37:09 UTC (rev 31241)
@@ -182,8 +182,6 @@
nu = dl -> nurb;
dl->nors= MEM_callocN(sizeof(float) * 3 *
NRB_getVertexCount(nu -> nurbanaPtr), "dlnors");
NRB_getNormals(nu -> nurbanaPtr, dl -> index, dl ->
trian, dl -> verts, dl -> nors);
- for(a=0;a<NRB_getVertexCount(nu -> nurbanaPtr);a+=3)
- printf("normalss: %.3f, %.3f, %.3f
\n",dl->nors[a],dl->nors[a+1],dl->nors[a+2]);
} else if(dl->type==DL_SURF) {
if(dl->nors==NULL) {
dl->nors=
MEM_callocN(sizeof(float)*3*dl->nr*dl->parts, "dlnors");
Modified: branches/nurbs-merge/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- branches/nurbs-merge/source/blender/makesrna/intern/rna_curve.c
2010-08-11 15:36:47 UTC (rev 31240)
+++ branches/nurbs-merge/source/blender/makesrna/intern/rna_curve.c
2010-08-11 15:37:09 UTC (rev 31241)
@@ -249,10 +249,6 @@
static void rna_Curve_update_data(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- Nurb *nu= (Nurb*)ptr->data;
- nurbanaSizeChanged(nu);
- nurbanaResetIsoLines(nu);
-
rna_Curve_update_data_id(bmain, scene, ptr->id.data);
}
@@ -347,6 +343,8 @@
while(nu) {
nu->resolu= cu->resolu;
+ nurbanaSizeChanged(nu);
+ nurbanaResetIsoLines(nu);
nu= nu->next;
}
@@ -362,6 +360,8 @@
while(nu) {
nu->resolv= cu->resolv;
+ nurbanaSizeChanged(nu);
+ nurbanaResetIsoLines(nu);
nu= nu->next;
}
@@ -1384,7 +1384,7 @@
RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v");
- prop= RNA_def_property(srna, "isolines", PROP_BOOLEAN, PROP_NONE);
+/* prop= RNA_def_property(srna, "isolines", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "isovis", 0);
RNA_def_property_ui_text(prop, "Isolines", "Turn on isolines which
define the surface in U and V."); //FIXME eman better description?
RNA_def_property_update(prop, 0, "rna_Curve_update_isolines");
@@ -1400,7 +1400,7 @@
RNA_def_property_range(prop, 1, 1024);
RNA_def_property_ui_text(prop, "Isoline Density", "Number of isolines
per surface.");
RNA_def_property_update(prop, 0, "rna_Curve_update_isolines");
-
+*/
prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_SMOOTH);
RNA_def_property_ui_text(prop, "Smooth", "Smooth the normals of the
surface or beveled curve");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
