[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56200] trunk/blender/source/blender: Fix #35039: two other issues with curve caps

Sergey Sharybin sergey.vfx at gmail.com
Mon Apr 22 11:26:03 CEST 2013


Revision: 56200
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56200
Author:   nazgul
Date:     2013-04-22 09:26:02 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
Fix #35039: two other issues with curve caps

- Skip filling caps if spline is cyclic
- Use hard limit of 1024 for curve resolution

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-22 09:25:37 UTC (rev 56199)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-22 09:26:02 UTC (rev 56200)
@@ -1530,7 +1530,7 @@
 								else
 									rotateBevelPiece(cu, bevp, NULL, dlb, 0.0f, widfac, fac, &data);
 
-								if (cu->bevobj && (cu->flag & CU_FILL_CAPS)) {
+								if (cu->bevobj && (cu->flag & CU_FILL_CAPS) && !(nu->flagu & CU_NURB_CYCLIC)) {
 									if (a == 1)
 										fillBevelCap(nu, dlb, cur_data - 3 * dlb->nr, &bottom_capbase);
 									if (a == steps - 1)

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2013-04-22 09:25:37 UTC (rev 56199)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2013-04-22 09:26:02 UTC (rev 56200)
@@ -1330,7 +1330,7 @@
 	
 	prop = RNA_def_property(srna, "resolution_u", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolu");
-	RNA_def_property_range(prop, 1, SHRT_MAX);
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_range(prop, 1, 64, 1, -1);
 	RNA_def_property_ui_text(prop, "Resolution U", "Surface resolution in U direction");
 	RNA_def_property_update(prop, 0, "rna_Curve_resolution_u_update_data");
@@ -1338,13 +1338,13 @@
 	prop = RNA_def_property(srna, "resolution_v", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolv");
 	RNA_def_property_ui_range(prop, 1, 64, 1, -1);
-	RNA_def_property_range(prop, 1, SHRT_MAX);
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_text(prop, "Resolution V", "Surface resolution in V direction");
 	RNA_def_property_update(prop, 0, "rna_Curve_resolution_v_update_data");
 	
 	prop = RNA_def_property(srna, "render_resolution_u", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolu_ren");
-	RNA_def_property_range(prop, 0, SHRT_MAX);
+	RNA_def_property_range(prop, 0, 1024);
 	RNA_def_property_ui_range(prop, 0, 64, 1, -1);
 	RNA_def_property_ui_text(prop, "Render Resolution U",
 	                         "Surface resolution in U direction used while rendering (zero skips this property)");
@@ -1352,7 +1352,7 @@
 	prop = RNA_def_property(srna, "render_resolution_v", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolv_ren");
 	RNA_def_property_ui_range(prop, 0, 64, 1, -1);
-	RNA_def_property_range(prop, 0, SHRT_MAX);
+	RNA_def_property_range(prop, 0, 1024);
 	RNA_def_property_ui_text(prop, "Render Resolution V",
 	                         "Surface resolution in V direction used while rendering (zero skips this property)");
 	
@@ -1568,14 +1568,14 @@
 
 	prop = RNA_def_property(srna, "resolution_u", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolu");
-	RNA_def_property_range(prop, 1, SHRT_MAX);
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_range(prop, 1, 64, 1, -1);
 	RNA_def_property_ui_text(prop, "Resolution U", "Curve or Surface subdivisions per segment");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
 	prop = RNA_def_property(srna, "resolution_v", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "resolv");
-	RNA_def_property_range(prop, 1, SHRT_MAX);
+	RNA_def_property_range(prop, 1, 1024);
 	RNA_def_property_ui_range(prop, 1, 64, 1, -1);
 	RNA_def_property_ui_text(prop, "Resolution V", "Surface subdivisions per segment");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");




More information about the Bf-blender-cvs mailing list