Revision: 48947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48947
Author: kjym3
Date: 2012-07-15 22:30:02 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
Sphere radius and Kr derivative epsilon (removed in revision 43902) were
recovered in the Parameter Editor mode.
Several users requested the recovery as the removal of the two parameters was
considered over-simplification for advanced users.
As in the Python Scripting mode, the two parameters are in the "advanced edge
detection options" section and disabled by default.
Also the lower limit of Kr derivative epsilon was changed from 0 to -1000 so as
to permit a negative value.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43902
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
Modified:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
2012-07-15 18:24:16 UTC (rev 48946)
+++
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
2012-07-15 22:30:02 UTC (rev 48947)
@@ -210,6 +210,14 @@
col.label(text="Edge Detection Options:")
col.prop(freestyle, "use_smoothness")
col.prop(freestyle, "crease_angle")
+ if freestyle.mode == "SCRIPT":
+ col.prop(freestyle, "use_material_boundaries")
+ col.prop(freestyle, "use_ridges_and_valleys")
+ col.prop(freestyle, "use_suggestive_contours")
+ col.prop(freestyle, "use_advanced_options")
+ if freestyle.use_advanced_options:
+ col.prop(freestyle, "sphere_radius")
+ col.prop(freestyle, "kr_derivative_epsilon")
if freestyle.mode == "EDITOR":
@@ -235,13 +243,6 @@
else: # freestyle.mode == "SCRIPT"
- col.prop(freestyle, "use_material_boundaries")
- col.prop(freestyle, "use_ridges_and_valleys")
- col.prop(freestyle, "use_suggestive_contours")
- col.prop(freestyle, "use_advanced_options")
- if freestyle.use_advanced_options:
- col.prop(freestyle, "sphere_radius")
- col.prop(freestyle, "kr_derivative_epsilon")
col.separator()
col.operator("scene.freestyle_module_add")
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
2012-07-15 18:24:16 UTC (rev 48946)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
2012-07-15 22:30:02 UTC (rev 48947)
@@ -343,7 +343,7 @@
}
// set parameters
- if (config->mode == FREESTYLE_CONTROL_SCRIPT_MODE &&
(config->flags & FREESTYLE_ADVANCED_OPTIONS_FLAG)) {
+ if (config->flags & FREESTYLE_ADVANCED_OPTIONS_FLAG) {
controller->setSphereRadius( config->sphere_radius );
controller->setSuggestiveContourKrDerivativeEpsilon(
config->dkr_epsilon );
} else {
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2012-07-15 18:24:16 UTC (rev 48946)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2012-07-15 22:30:02 UTC (rev 48947)
@@ -2666,7 +2666,7 @@
prop= RNA_def_property(srna, "kr_derivative_epsilon", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "dkr_epsilon");
- RNA_def_property_range(prop, 0.0, 1000.0);
+ RNA_def_property_range(prop, -1000.0, 1000.0);
RNA_def_property_ui_text(prop, "Kr Derivative Epsilon", "Kr derivative
epsilon for computing suggestive contours");
RNA_def_property_update(prop, NC_SCENE, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
