diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-28 20:09:51 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-28 20:09:51 +0400 |
| commit | 5acd5d14970c829c2873623716a67beeb6da5278 (patch) | |
| tree | f805a8fd6d5ae5ad4a6d9903f5c26b511a21c32b /source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | |
| parent | f252230216ce0b6e73ed69edb1c05a07ac1e373a (diff) | |
Improvements of Freestyle GUI controls - Part 1.
This commit makes a set of fixes and improvements based on the results of
Freestyle branch review by Brecht. The discussion thread is:
http://lists.blender.org/pipermail/bf-committers/2012-October/037927.html
* The Layers panel and Freestyle-related panels in the Render tab of the
Properties window were moved to the newly created Render Layers tab.
The idea is to separate per render layer rendering options into a distinct
Properties window tab, and use the existing Render tab to accommodate
per scene rendering options.
* The new Freestyle panel was added in the Render tab. The panel header
contains a toggle button for globally enabling Freestyle, with the aim of making
Freestyle easier to find. Those Freestyle options in the Post Processing panel
were also moved to the new panel.
* GUI code was updated so that UI controls will be greyed out (instead of
being hidden) when Freestyle is disabled. Additional UI changes were also
made to reduce space consumption.
* The list of line sets was moved from the Freestyle panel to the Freestyle:
Line Sets panel.
* Old ray-casting algorithms were removed from the UI. Now only two
algorithms (culled and non-culled cumulative visibility detection algorithms)
are available, and the selection is done by the new "Culling" toggle button
within the edge detection options.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 5dcda3bd69c..b5e67597caa 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -352,7 +352,8 @@ extern "C" { } controller->setFaceSmoothness( (config->flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) ? true : false); controller->setCreaseAngle( config->crease_angle ); - controller->setVisibilityAlgo( config->raycasting_algorithm ); + controller->setVisibilityAlgo( (config->flags & FREESTYLE_CULLING) ? + FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE : FREESTYLE_ALGO_ADAPTIVE_CUMULATIVE ); cout << "Crease angle : " << controller->getCreaseAngle() << endl; cout << "Sphere radius : " << controller->getSphereRadius() << endl; @@ -527,8 +528,6 @@ extern "C" { config->crease_angle = 134.43f; config->linesets.first = config->linesets.last = NULL; - - config->raycasting_algorithm = FREESTYLE_ALGO_REGULAR; } void FRS_free_freestyle_config( SceneRenderLayer* srl ) |