Revision: 43854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43854
Author: nazgul
Date: 2012-02-02 19:20:51 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Disallow fill caps for curves without bevel object.
It's getting complicated to detect which part of curve is actually a
cap in cases like extruded 2d curve with non-zero depth.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/source/blender/blenkernel/intern/displist.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
2012-02-02 18:50:44 UTC (rev 43853)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
2012-02-02 19:20:51 UTC (rev 43854)
@@ -112,7 +112,6 @@
sub.active = (curve.dimensions == '2D' or (curve.bevel_object is
None and curve.dimensions == '3D'))
sub.prop(curve, "fill_mode", text="")
col.prop(curve, "use_fill_deform")
- col.prop(curve, "use_fill_caps")
class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel):
@@ -166,7 +165,11 @@
col.label(text="Bevel Object:")
col.prop(curve, "bevel_object", text="")
+ row = col.row()
+ row.active = curve.bevel_object != None
+ row.prop(curve, "use_fill_caps")
+
class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel):
bl_label = "Path Animation"
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-02-02
18:50:44 UTC (rev 43853)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-02-02
19:20:51 UTC (rev 43854)
@@ -1360,7 +1360,7 @@
/* rotate bevel
piece and write in data */
rotateBevelPiece(cu, bevp, dlb, widfac, fac, &data);
- if (cu->flag &
CU_FILL_CAPS) {
+ if (cu->bevobj
&& (cu->flag & CU_FILL_CAPS)) {
if (a
== 0)
fillBevelCap(cu, nu, bevp, dlb, fac, widfac, &bottom_capbase);
else if
(a == bl->nr - 1)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
