Commit Graph

81 Commits

Author SHA1 Message Date
7f3488f992 Freestyle: show "use_nodes" option in the UI when Cycles is enabled.
The "use_textures" option is intended for the BI and does not make sense in Cycles.
2014-08-12 10:10:30 +09:00
d956a074e3 Freestyle: Show the Freestyle Line panel of the Material properties context also in Cycles 2014-08-12 10:10:13 +09:00
f70e1ad2fb Proof-of-concept implementation of Freestyle support for Cycles. 2014-08-12 10:10:05 +09:00
12720352a0 Freestyle: removed the context switch button from the Freestyle panel in the Render properties window.
The button was intended to guide new users of Freestyle, but actually that is a matter
of documentation.  The button is unlikely to be frequently used once users get familiar
with Freestyle panels in other contexts.  Now that Freestyle has been part of Blender
since a while, it seems time to clean the UI.
2014-07-22 16:39:29 +09:00
7915d7277a Per-material line color settings for Freestyle.
New properties 'line_color' and 'line_priority' are added to Material ID data blocks.

The 'line_color' property allows users to specify a per-material line color that can be
used as a Freestyle line color through Material color modifiers of line style settings.

The new line color property is intended to provide a solution for line color
stylization when a proper Freestyle support for Cycles is implemented (likely
as part of the upcoming Blender 2.72 release; see Patch D632).  Materials in
Cycles are usually set up using shader nodes, and Freestyle won't be capable
of retrieving colors and other properties from node-based materials any soon.

The new line color property of materials addresses this foreseen limitation by
providing artists with an intuitive alternative mean to specify line colors on a
per-material basis independently from node trees.

The 'line_priority' property gives users a way to control line colors at material
boundaries.  When a line is drawn along a feature edge at material boundaries,
one of the two materials on both sides of the edge has to be picked up to
determine the line color.  So far there was no way to control this selection
(which was in effect at random).  Now the material with a higher line color
priority will be selected.

The new per-material line settings are shown in the new Freestyle Line tab in
the Material context of the Properties window (only when Freestyle is enabled).
2014-07-07 16:19:51 +09:00
f5d9f45a6f Freestyle: Revised a UI text for better understandability in the Outliner. 2014-05-05 19:54:55 +09:00
b7f085d9c1 Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora.
Reviewers: brecht, kjym3, #freestyle

Reviewed By: brecht, kjym3

Differential Revision: https://developer.blender.org/D246
2014-05-03 18:54:59 +09:00
ece64c7ffd Freestyle: minor UI improvements.
* The button icon for jumping to the Render Layers tab of the Properties context is
now RENDERLAYERS.  Previous icon BUTS was too general.

* Thickness position options are grayed out if not applicable.  These options are applied
only when plain chaining is used with the Same Object option enabled.
2014-04-24 23:45:28 +09:00
5a3fbc8af7 Freestyle: minor changes to the UI layout of line style options.
Toggle buttons are now placed to the left of those labels separating sets of line style
options, so as to save some space (in line with the new UI elements added in the
commit f60a66f417).
2014-04-18 15:11:20 +09:00
f60a66f417 Freestyle: New options for sorting to arrange the stacking order of lines.
Line styles now have a set of new options for rearranging the stacking order of lines.
This gives artists more control to determine which lines should be drawn on top of others.
Two available sort keys are the distance from camera and curvilinear 2D length.
Since the distance of a line from camera may vary over vertices, another option called
integration type is used to compute the sort key for a line from the values computed at
individual vertices.  Available integration types are MEAN, MIN, MAX, FIRST and LAST
(see the tool tips for more detail).
2014-04-18 15:02:45 +09:00
3436c41dee Fix T38739: Simulations, unsupported in the Game Engine, could not be removed from the UI.
Also shorten info messages a bit.
2014-02-21 12:46:17 +01:00
fab96b5913 UI List: remove separate name text fields.
It was never the intention to have these separate, and now that we can rename
directly in the list there is no more need for them.
2013-11-24 14:27:02 +01:00
4c52e737df Add ctrl-click rename to most lists in Blender UI and templates/examples.
Notes:
* Did not touch to addons, that's up to the authors. ;)
* Did not removed any "name" field below lists. We might want to do this in some cases (less UI clutter), but probably not always, so will let maintainers of the related areas decide here.
2013-11-23 20:54:32 +01:00
f79eff2984 Interface / Template Lists:
* Reduce the space of more lists, should be all in bl_ui/
2013-10-13 23:24:37 +00:00
aaba317c76 Follow-up to r60433 (related to Bug #36878): additional checks for NULL line styles. 2013-09-30 23:02:29 +00:00
6c14f641f3 Partial revert of UI appearance changes in r52778 in the Strokes tab of the Freestyle Line Style panel. 2013-08-25 16:29:10 +00:00
5b83a89c81 Followup to r59434 : py UI scripts edits.
Notes:
* Made those edits by full checking of py files, so I should have spoted most needed edits, yet it remains quite probable I missed a few ones, we'll fix if/when someone notice it...
* Also made some cleanup "on the road"!
2013-08-23 20:41:21 +00:00
2085a42e52 pep8 cleanup 2013-06-27 03:05:19 +00:00
d958144b65 Removed the Material Boundary option from the edge detection options in
the Parameter Editor mode.  The Material Boundary toggle button takes
effect only in the Python Scripting mode.  Instead the Parameter Editor
mode automatically determines which edge types need to be computed on the
basis of user-specified line selection criteria in terms of edge types.

Problem report from Light BWK through personal communications, thanks!
2013-06-13 11:10:18 +00:00
d314600cd2 UI / Freestyle:
* Properties, which depend on an enum should be hidden, not greyed out.
2013-06-08 17:10:17 +00:00
67fb85b5f2 Added a short-cut button in the Freestyle Python Scripting mode for loading
a style module file as a text datablock and appending it to the style module
stack.
2013-06-01 22:37:15 +00:00
8df319f5e6 minor fixes for freestyle
- update copying code for linestyles to copy gaps
- update copying code for freestyle line modifiers to copy mapping flags and seeds
- fix drawing code for Material modifiers after a recent refactoring
2013-04-25 16:23:23 +00:00
53917c4e3a rna attribute consistency edits, use common prefix for booleans. 2013-04-23 07:06:29 +00:00
384e14bc84 Added to the Freestyle panel in the Render buttons a button to switch to the Render Layers context. 2013-04-10 20:20:20 +00:00
a963e7ae42 Code cleanup. 2013-04-10 02:58:22 +00:00
0fe1616e13 Fix for [#34934] Freestyle options are in wrong tab.
Added a label to guide users to line style settings in the Render Layers context
(in line with the similar labels found in the Cloth and Soft Body modifier panels),
so that Freestyle options per render layer can be more easily found.
2013-04-09 23:54:11 +00:00
551f0fa091 Freestyle UI:
* Remove "Unit" prefix from line thickness property. (discussed with Tamito in IRC)
2013-04-07 10:23:48 +00:00
0edbcd4cf9 Freestyle UI / Code cleanup:
* Do not share poll with other files, create own poll classes. 
* Avoid some splits() and use rows instead (less code).
* Remove some commented C code.
* layout = self.layout declarations come before variable declarations.
2013-04-07 10:10:00 +00:00
63d523336f freestyle lineset tag attribute was defined but not used, also some code cleanup. 2013-04-07 01:38:03 +00:00
1e8d69ac74 Use of text datablocks for storing Python style modules.
Suggested by Brecht Van Lommel and Campbell Barton through code review comments.

Previously style modules were external Python script files whose absolute paths
were kept in .blend files.  Now style modules are stored in .blend files as text
datablocks.

Style modules are configured in three steps:
1. Open an external style module file (or create a new text datablock) in the
Text Editor in Blender.
2. Add a style module to the list of style modules (by pressing the "Add" button)
in the Render Layer properties window.
3. Click the name entry and select the style module from the drop-down menu.
2013-04-03 00:00:29 +00:00
6df365f6a4 Moved the definitions of Freestyle-specific panels to its own module.
Suggested by Sergey Sharybin through a code review of the branch.
2013-03-21 23:25:18 +00:00