kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
609805eed3
blender/release/scripts/startup/bl_ui/properties_freestyle.py

845 lines
33 KiB
Python
Raw Normal View History

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
# ##### BEGIN GPL LICENSE BLOCK #####
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
# <pep8 compliant>
import bpy
from bpy.types import Menu, Panel, UIList
# Render properties
cleanup: pep8 also remove empty class parenthesis
2015-01-29 04:35:06 +00:00
class RenderFreestyleButtonsPanel:
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
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "render"
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
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
@classmethod
def poll(cls, context):
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
scene = context.scene
with_freestyle = bpy.app.build_options.freestyle
Workspaces: remove workspace engine, use 3D viewport draw mode instead. ViewRender was removed, which means we can't get the render engine for files saved in 2.8. We assume that any files saved in 2.8 were intended to use Eevee and set the engine to that. A fix included with this is that .blend thumbails now draw with Clay mode, and never Eevee or Cycles. These were drawn with solid mode in 2.7, and should be very fast and not e.g. load heavy image textures. Differential Revision: https://developer.blender.org/D3156
2018-04-17 11:35:05 +00:00
return scene and with_freestyle and(context.engine in cls.COMPAT_ENGINES)
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
class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel):
bl_label = "Freestyle"
bl_options = {'DEFAULT_CLOSED'}
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
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
def draw_header(self, context):
rd = context.scene.render
self.layout.prop(rd, "use_freestyle", text="")
def draw(self, context):
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
layout = self.layout
Revert "Freestyle: Built-in SVG exporter." This reverts commit 61a330baca0ff9bb3cf477c04f539ef276a0356f. This completes reverting D785 This feature is to be reworked into an addon.
2014-10-19 17:10:06 +00:00
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
rd = context.scene.render
layout.active = rd.use_freestyle
row = layout.row()
row.label(text="Line Thickness:")
row.prop(rd, "line_thickness_mode", expand=True)
pep8 cleanup
2013-06-27 03:05:19 +00:00
UI / Freestyle: * Properties, which depend on an enum should be hidden, not greyed out.
2013-06-08 17:10:17 +00:00
if (rd.line_thickness_mode == 'ABSOLUTE'):
layout.prop(rd, "line_thickness")
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
# Render layer properties
pep8 cleanup
2013-06-27 03:05:19 +00:00
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class ViewLayerFreestyleButtonsPanel:
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
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
bl_context = "view_layer"
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
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
@classmethod
def poll(cls, context):
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
scene = context.scene
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
rd = scene.render
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
with_freestyle = bpy.app.build_options.freestyle
pep8 cleanup
2013-06-27 03:05:19 +00:00
Cleanup: pep8, spelling
2015-04-22 06:26:00 +00:00
return (scene and with_freestyle and rd.use_freestyle and
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
(context.engine in cls.COMPAT_ENGINES))
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
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class ViewLayerFreestyleEditorButtonsPanel(ViewLayerFreestyleButtonsPanel):
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
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
@classmethod
def poll(cls, context):
if not super().poll(context):
return False
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
view_layer = context.view_layer
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
return view_layer and view_layer.freestyle_settings.mode == 'EDITOR'
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
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class VIEWLAYER_UL_linesets(UIList):
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
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
lineset = item
if self.layout_type in {'DEFAULT', 'COMPACT'}:
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 19:37:23 +00:00
layout.prop(lineset, "name", text="", emboss=False, icon_value=icon)
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
layout.prop(lineset, "show_render", text="", index=index)
Cleanup: don't use single sets for comparisons
2015-04-14 00:29:11 +00:00
elif self.layout_type == 'GRID':
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
layout.alignment = 'CENTER'
layout.label("", icon_value=icon)
class RENDER_MT_lineset_specials(Menu):
bl_label = "Lineset Specials"
def draw(self, context):
layout = self.layout
layout.operator("scene.freestyle_lineset_copy", icon='COPYDOWN')
layout.operator("scene.freestyle_lineset_paste", icon='PASTEDOWN')
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel):
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
bl_label = "Freestyle"
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
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
def draw(self, context):
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
layout = self.layout
pep8 cleanup
2013-06-27 03:05:19 +00:00
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 15:39:25 +00:00
scene = context.scene
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
view_layer = context.view_layer
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
freestyle = view_layer.freestyle_settings
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
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
layout.active = view_layer.use_freestyle
pep8 cleanup
2013-06-27 03:05:19 +00:00
Freestyle: View map caching. New render layer option named "View map cache" is added to reuse a previously computed view map for subsequent rendering. The cache is automatically updated when the mesh geometry of the input 3D scene has been changed. This functionality offers a major performance boost for Freestyle animation rendering when camera-space mesh geometry is static, as well as for repeated still renders with updates of line stylization options. Although the "View map cache" toggle is a render layer option, the cache memory is shared by all render layers and scenes. This means that if Freestyle is used for two or more render layers (possibly in different scenes through the compositor), then the cached view map for one render layer is replaced by a new view map for another render layer and hence no performance gain is expected.
2014-01-28 14:24:59 +00:00
row = layout.row()
Cleanup: use title caps for labels Also consistent quoting (single quotes for enums, text uses double).
2017-09-02 05:42:29 +00:00
layout.prop(freestyle, "mode", text="Control Mode")
Freestyle: View map caching. New render layer option named "View map cache" is added to reuse a previously computed view map for subsequent rendering. The cache is automatically updated when the mesh geometry of the input 3D scene has been changed. This functionality offers a major performance boost for Freestyle animation rendering when camera-space mesh geometry is static, as well as for repeated still renders with updates of line stylization options. Although the "View map cache" toggle is a render layer option, the cache memory is shared by all render layers and scenes. This means that if Freestyle is used for two or more render layers (possibly in different scenes through the compositor), then the cached view map for one render layer is replaced by a new view map for another render layer and hence no performance gain is expected.
2014-01-28 14:24:59 +00:00
layout.prop(freestyle, "use_view_map_cache", text="View Map Cache")
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
layout.label(text="Edge Detection Options:")
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
split = layout.split()
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
col = split.column()
col.prop(freestyle, "crease_angle")
col.prop(freestyle, "use_culling")
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
col.prop(freestyle, "use_advanced_options")
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
col = split.column()
col.prop(freestyle, "use_smoothness")
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
if freestyle.mode == 'SCRIPT':
col.prop(freestyle, "use_material_boundaries")
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
# Advanced options are hidden by default to warn new users
if freestyle.use_advanced_options:
if freestyle.mode == 'SCRIPT':
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
row = layout.row()
row.prop(freestyle, "use_ridges_and_valleys")
row.prop(freestyle, "use_suggestive_contours")
row = layout.row()
row.prop(freestyle, "sphere_radius")
row.prop(freestyle, "kr_derivative_epsilon")
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
if freestyle.mode == 'SCRIPT':
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
row = layout.row()
row.label("Style modules:")
row.operator("scene.freestyle_module_add", text="Add")
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
for i, module in enumerate(freestyle.modules):
box = layout.box()
box.context_pointer_set("freestyle_module", module)
row = box.row(align=True)
row.prop(module, "use", text="")
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
row.prop(module, "script", text="")
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
row.operator("scene.freestyle_module_open", icon='FILESEL', text="")
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
row.operator("scene.freestyle_module_remove", icon='X', text="")
row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP'
row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel):
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
bl_label = "Freestyle Line Set"
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
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
def draw_edge_type_buttons(self, box, lineset, edge_type):
# property names
select_edge_type = "select_" + edge_type
exclude_edge_type = "exclude_" + edge_type
# draw edge type buttons
row = box.row(align=True)
row.prop(lineset, select_edge_type)
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
sub = row.column(align=True)
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
sub.prop(lineset, exclude_edge_type, text="")
sub.active = getattr(lineset, select_edge_type)
def draw(self, context):
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
layout = self.layout
pep8 cleanup
2013-06-27 03:05:19 +00:00
Workspace: Move engines to workspace and Properties Editor cleanup Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842
2017-10-16 19:15:03 +00:00
scene = context.scene
rd = scene.render
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
view_layer = context.view_layer
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
freestyle = view_layer.freestyle_settings
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
lineset = freestyle.linesets.active
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
layout.active = view_layer.use_freestyle
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
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
row = layout.row()
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 13:25:38 +00:00
rows = 4 if lineset else 2
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
row.template_list("VIEWLAYER_UL_linesets", "", freestyle, "linesets", freestyle.linesets, "active_index", rows=rows)
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
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
sub = row.column(align=True)
sub.operator("scene.freestyle_lineset_add", icon='ZOOMIN', text="")
sub.operator("scene.freestyle_lineset_remove", icon='ZOOMOUT', text="")
sub.menu("RENDER_MT_lineset_specials", icon='DOWNARROW_HLT', text="")
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
if lineset:
sub.separator()
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
sub.separator()
sub.operator("scene.freestyle_lineset_move", icon='TRIA_UP', text="").direction = 'UP'
sub.operator("scene.freestyle_lineset_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
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
col = layout.column()
col.label(text="Selection By:")
row = col.row(align=True)
row.prop(lineset, "select_by_visibility", text="Visibility", toggle=True)
row.prop(lineset, "select_by_edge_types", text="Edge Types", toggle=True)
row.prop(lineset, "select_by_face_marks", text="Face Marks", toggle=True)
row.prop(lineset, "select_by_group", text="Group", toggle=True)
row.prop(lineset, "select_by_image_border", text="Image Border", toggle=True)
if lineset.select_by_visibility:
col.label(text="Visibility:")
row = col.row(align=True)
row.prop(lineset, "visibility", expand=True)
if lineset.visibility == 'RANGE':
row = col.row(align=True)
row.prop(lineset, "qi_start")
row.prop(lineset, "qi_end")
if lineset.select_by_edge_types:
col.label(text="Edge Types:")
row = col.row()
row.prop(lineset, "edge_type_negation", expand=True)
row.prop(lineset, "edge_type_combination", expand=True)
split = col.split()
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
sub = split.column()
self.draw_edge_type_buttons(sub, lineset, "silhouette")
self.draw_edge_type_buttons(sub, lineset, "border")
self.draw_edge_type_buttons(sub, lineset, "contour")
self.draw_edge_type_buttons(sub, lineset, "suggestive_contour")
self.draw_edge_type_buttons(sub, lineset, "ridge_valley")
pep8 cleanup
2013-06-27 03:05:19 +00:00
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
sub = split.column()
self.draw_edge_type_buttons(sub, lineset, "crease")
self.draw_edge_type_buttons(sub, lineset, "edge_mark")
self.draw_edge_type_buttons(sub, lineset, "external_contour")
self.draw_edge_type_buttons(sub, lineset, "material_boundary")
if lineset.select_by_face_marks:
col.label(text="Face Marks:")
row = col.row()
row.prop(lineset, "face_mark_negation", expand=True)
row.prop(lineset, "face_mark_condition", expand=True)
if lineset.select_by_group:
col.label(text="Group:")
row = col.row()
row.prop(lineset, "group", text="")
row.prop(lineset, "group_negation", expand=True)
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Panel):
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
bl_label = "Freestyle Line Style"
bl_options = {'DEFAULT_CLOSED'}
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
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
def draw_modifier_box_header(self, box, modifier):
row = box.row()
row.context_pointer_set("modifier", modifier)
if modifier.expanded:
icon = 'TRIA_DOWN'
else:
icon = 'TRIA_RIGHT'
row.prop(modifier, "expanded", text="", icon=icon, emboss=False)
# TODO: Use icons rather than text label, would save some room!
row.label(text=modifier.rna_type.name)
row.prop(modifier, "name", text="")
if modifier.use:
icon = 'RESTRICT_RENDER_OFF'
else:
icon = 'RESTRICT_RENDER_ON'
row.prop(modifier, "use", text="", icon=icon)
sub = row.row(align=True)
sub.operator("scene.freestyle_modifier_copy", icon='NONE', text="Copy")
sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP'
sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
sub.operator("scene.freestyle_modifier_remove", icon='X', text="")
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
def draw_modifier_box_error(self, box, modifier, message):
row = box.row()
Cleanup: use title caps for labels Also consistent quoting (single quotes for enums, text uses double).
2017-09-02 05:42:29 +00:00
row.label(text=message, icon='ERROR')
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
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
def draw_modifier_common(self, box, modifier):
row = box.row()
row.prop(modifier, "blend", text="")
row.prop(modifier, "influence")
def draw_modifier_color_ramp_common(self, box, modifier, has_range):
box.template_color_ramp(modifier, "color_ramp", expand=True)
if has_range:
row = box.row(align=True)
row.prop(modifier, "range_min")
row.prop(modifier, "range_max")
def draw_modifier_curve_common(self, box, modifier, has_range, has_value):
row = box.row()
row.prop(modifier, "mapping", text="")
sub = row.column()
sub.prop(modifier, "invert")
if modifier.mapping == 'CURVE':
sub.active = False
box.template_curve_mapping(modifier, "curve")
if has_range:
row = box.row(align=True)
row.prop(modifier, "range_min")
row.prop(modifier, "range_max")
if has_value:
row = box.row(align=True)
row.prop(modifier, "value_min")
row.prop(modifier, "value_max")
def draw_color_modifier(self, context, modifier):
layout = self.layout
col = layout.column(align=True)
self.draw_modifier_box_header(col.box(), modifier)
if modifier.expanded:
box = col.box()
self.draw_modifier_common(box, modifier)
if modifier.type == 'ALONG_STROKE':
self.draw_modifier_color_ramp_common(box, modifier, False)
elif modifier.type == 'DISTANCE_FROM_OBJECT':
box.prop(modifier, "target")
self.draw_modifier_color_ramp_common(box, modifier, True)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'COLOR'
prop.name = modifier.name
elif modifier.type == 'DISTANCE_FROM_CAMERA':
self.draw_modifier_color_ramp_common(box, modifier, True)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'COLOR'
prop.name = modifier.name
elif modifier.type == 'MATERIAL':
row = box.row()
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
row.prop(modifier, "material_attribute", text="")
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
sub = row.column()
sub.prop(modifier, "use_ramp")
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 06:54:46 +00:00
if modifier.material_attribute in {'LINE', 'DIFF', 'SPEC'}:
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
sub.active = True
show_ramp = modifier.use_ramp
else:
sub.active = False
show_ramp = True
if show_ramp:
self.draw_modifier_color_ramp_common(box, modifier, False)
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
elif modifier.type == 'TANGENT':
self.draw_modifier_color_ramp_common(box, modifier, False)
elif modifier.type == 'NOISE':
self.draw_modifier_color_ramp_common(box, modifier, False)
row = box.row(align=False)
row.prop(modifier, "amplitude")
row.prop(modifier, "period")
row.prop(modifier, "seed")
elif modifier.type == 'CREASE_ANGLE':
self.draw_modifier_color_ramp_common(box, modifier, False)
row = box.row(align=True)
row.prop(modifier, "angle_min")
row.prop(modifier, "angle_max")
elif modifier.type == 'CURVATURE_3D':
self.draw_modifier_color_ramp_common(box, modifier, False)
row = box.row(align=True)
row.prop(modifier, "curvature_min")
row.prop(modifier, "curvature_max")
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
freestyle = context.view_layer.freestyle_settings
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
if not freestyle.use_smoothness:
message = "Enable Face Smoothness to use this modifier"
self.draw_modifier_box_error(col.box(), modifier, message)
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
def draw_alpha_modifier(self, context, modifier):
layout = self.layout
col = layout.column(align=True)
self.draw_modifier_box_header(col.box(), modifier)
if modifier.expanded:
box = col.box()
self.draw_modifier_common(box, modifier)
if modifier.type == 'ALONG_STROKE':
self.draw_modifier_curve_common(box, modifier, False, False)
elif modifier.type == 'DISTANCE_FROM_OBJECT':
box.prop(modifier, "target")
self.draw_modifier_curve_common(box, modifier, True, False)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'ALPHA'
prop.name = modifier.name
elif modifier.type == 'DISTANCE_FROM_CAMERA':
self.draw_modifier_curve_common(box, modifier, True, False)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'ALPHA'
prop.name = modifier.name
elif modifier.type == 'MATERIAL':
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
box.prop(modifier, "material_attribute", text="")
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
self.draw_modifier_curve_common(box, modifier, False, False)
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
elif modifier.type == 'TANGENT':
self.draw_modifier_curve_common(box, modifier, False, False)
elif modifier.type == 'NOISE':
self.draw_modifier_curve_common(box, modifier, False, False)
row = box.row(align=False)
row.prop(modifier, "amplitude")
row.prop(modifier, "period")
row.prop(modifier, "seed")
elif modifier.type == 'CREASE_ANGLE':
self.draw_modifier_curve_common(box, modifier, False, False)
row = box.row(align=True)
row.prop(modifier, "angle_min")
row.prop(modifier, "angle_max")
elif modifier.type == 'CURVATURE_3D':
self.draw_modifier_curve_common(box, modifier, False, False)
row = box.row(align=True)
row.prop(modifier, "curvature_min")
row.prop(modifier, "curvature_max")
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
freestyle = context.view_layer.freestyle_settings
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
if not freestyle.use_smoothness:
message = "Enable Face Smoothness to use this modifier"
self.draw_modifier_box_error(col.box(), modifier, message)
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
def draw_thickness_modifier(self, context, modifier):
layout = self.layout
col = layout.column(align=True)
self.draw_modifier_box_header(col.box(), modifier)
if modifier.expanded:
box = col.box()
self.draw_modifier_common(box, modifier)
if modifier.type == 'ALONG_STROKE':
self.draw_modifier_curve_common(box, modifier, False, True)
elif modifier.type == 'DISTANCE_FROM_OBJECT':
box.prop(modifier, "target")
self.draw_modifier_curve_common(box, modifier, True, True)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'THICKNESS'
prop.name = modifier.name
elif modifier.type == 'DISTANCE_FROM_CAMERA':
self.draw_modifier_curve_common(box, modifier, True, True)
prop = box.operator("scene.freestyle_fill_range_by_selection")
prop.type = 'THICKNESS'
prop.name = modifier.name
elif modifier.type == 'MATERIAL':
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
box.prop(modifier, "material_attribute", text="")
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
self.draw_modifier_curve_common(box, modifier, False, True)
elif modifier.type == 'CALLIGRAPHY':
box.prop(modifier, "orientation")
row = box.row(align=True)
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
row.prop(modifier, "thickness_min")
row.prop(modifier, "thickness_max")
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
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
elif modifier.type == 'TANGENT':
self.draw_modifier_curve_common(box, modifier, False, False)
self.mapping = 'CURVE'
row = box.row(align=True)
row.prop(modifier, "thickness_min")
row.prop(modifier, "thickness_max")
elif modifier.type == 'NOISE':
row = box.row(align=False)
row.prop(modifier, "amplitude")
row.prop(modifier, "period")
row = box.row(align=False)
row.prop(modifier, "seed")
row.prop(modifier, "use_asymmetric")
elif modifier.type == 'CREASE_ANGLE':
self.draw_modifier_curve_common(box, modifier, False, False)
row = box.row(align=True)
row.prop(modifier, "thickness_min")
row.prop(modifier, "thickness_max")
row = box.row(align=True)
row.prop(modifier, "angle_min")
row.prop(modifier, "angle_max")
elif modifier.type == 'CURVATURE_3D':
self.draw_modifier_curve_common(box, modifier, False, False)
row = box.row(align=True)
row.prop(modifier, "thickness_min")
row.prop(modifier, "thickness_max")
row = box.row(align=True)
row.prop(modifier, "curvature_min")
row.prop(modifier, "curvature_max")
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
freestyle = context.view_layer.freestyle_settings
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
if not freestyle.use_smoothness:
message = "Enable Face Smoothness to use this modifier"
self.draw_modifier_box_error(col.box(), modifier, message)
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
def draw_geometry_modifier(self, context, modifier):
layout = self.layout
col = layout.column(align=True)
self.draw_modifier_box_header(col.box(), modifier)
if modifier.expanded:
box = col.box()
if modifier.type == 'SAMPLING':
box.prop(modifier, "sampling")
elif modifier.type == 'BEZIER_CURVE':
box.prop(modifier, "error")
elif modifier.type == 'SINUS_DISPLACEMENT':
split = box.split()
col = split.column()
col.prop(modifier, "wavelength")
col.prop(modifier, "amplitude")
col = split.column()
col.prop(modifier, "phase")
elif modifier.type == 'SPATIAL_NOISE':
split = box.split()
col = split.column()
col.prop(modifier, "amplitude")
col.prop(modifier, "scale")
col.prop(modifier, "octaves")
col = split.column()
col.prop(modifier, "smooth")
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
col.prop(modifier, "use_pure_random")
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
elif modifier.type == 'PERLIN_NOISE_1D':
split = box.split()
col = split.column()
col.prop(modifier, "frequency")
col.prop(modifier, "amplitude")
col.prop(modifier, "seed")
col = split.column()
col.prop(modifier, "octaves")
col.prop(modifier, "angle")
elif modifier.type == 'PERLIN_NOISE_2D':
split = box.split()
col = split.column()
col.prop(modifier, "frequency")
col.prop(modifier, "amplitude")
col.prop(modifier, "seed")
col = split.column()
col.prop(modifier, "octaves")
col.prop(modifier, "angle")
elif modifier.type == 'BACKBONE_STRETCHER':
box.prop(modifier, "backbone_length")
elif modifier.type == 'TIP_REMOVER':
box.prop(modifier, "tip_length")
elif modifier.type == 'POLYGONIZATION':
box.prop(modifier, "error")
elif modifier.type == 'GUIDING_LINES':
box.prop(modifier, "offset")
elif modifier.type == 'BLUEPRINT':
row = box.row()
row.prop(modifier, "shape", expand=True)
box.prop(modifier, "rounds")
row = box.row()
if modifier.shape in {'CIRCLES', 'ELLIPSES'}:
row.prop(modifier, "random_radius")
row.prop(modifier, "random_center")
elif modifier.shape == 'SQUARES':
row.prop(modifier, "backbone_length")
row.prop(modifier, "random_backbone")
elif modifier.type == '2D_OFFSET':
row = box.row(align=True)
row.prop(modifier, "start")
row.prop(modifier, "end")
row = box.row(align=True)
row.prop(modifier, "x")
row.prop(modifier, "y")
elif modifier.type == '2D_TRANSFORM':
box.prop(modifier, "pivot")
if modifier.pivot == 'PARAM':
box.prop(modifier, "pivot_u")
elif modifier.pivot == 'ABSOLUTE':
row = box.row(align=True)
row.prop(modifier, "pivot_x")
row.prop(modifier, "pivot_y")
row = box.row(align=True)
row.prop(modifier, "scale_x")
row.prop(modifier, "scale_y")
box.prop(modifier, "angle")
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 12:57:23 +00:00
elif modifier.type == 'SIMPLIFICATION':
box.prop(modifier, "tolerance")
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
def draw(self, context):
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
layout = self.layout
pep8 cleanup
2013-06-27 03:05:19 +00:00
SceneRenderLayer Removal/Refactor This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-16 15:39:25 +00:00
scene = context.scene
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 13:20:17 +00:00
view_layer = context.view_layer
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
lineset = view_layer.freestyle_settings.linesets.active
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
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
layout.active = view_layer.use_freestyle
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
if lineset is None:
return
linestyle = lineset.linestyle
layout.template_ID(lineset, "linestyle", new="scene.freestyle_linestyle_new")
Follow-up to r60433 (related to Bug #36878): additional checks for NULL line styles.
2013-09-30 23:02:29 +00:00
if linestyle is None:
return
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
row = layout.row(align=True)
row.prop(linestyle, "panel", expand=True)
if linestyle.panel == 'STROKES':
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Chaining
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 f60a66f41784de388a01c4c882c969730d675375).
2014-04-18 06:11:20 +00:00
layout.prop(linestyle, "use_chaining", text="Chaining:")
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
split = layout.split(align=True)
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 f60a66f41784de388a01c4c882c969730d675375).
2014-04-18 06:11:20 +00:00
split.active = linestyle.use_chaining
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
# First column
col = split.column()
col.active = linestyle.use_chaining
col.prop(linestyle, "chaining", text="")
if linestyle.chaining == 'SKETCHY':
col.prop(linestyle, "rounds")
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 f60a66f41784de388a01c4c882c969730d675375).
2014-04-18 06:11:20 +00:00
# Second column
col = split.column()
col.prop(linestyle, "use_same_object")
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
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Splitting
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
layout.label(text="Splitting:")
split = layout.split(align=True)
# First column
col = split.column()
row = col.row(align=True)
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
row.prop(linestyle, "use_angle_min", text="")
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
sub = row.row()
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
sub.active = linestyle.use_angle_min
sub.prop(linestyle, "angle_min")
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
row = col.row(align=True)
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
row.prop(linestyle, "use_angle_max", text="")
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
sub = row.row()
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
sub.active = linestyle.use_angle_max
sub.prop(linestyle, "angle_max")
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
# Second column
col = split.column()
row = col.row(align=True)
row.prop(linestyle, "use_split_length", text="")
sub = row.row()
sub.active = linestyle.use_split_length
sub.prop(linestyle, "split_length", text="2D Length")
row = col.row(align=True)
row.prop(linestyle, "material_boundary")
# End of columns
row = layout.row(align=True)
row.prop(linestyle, "use_split_pattern", text="")
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
sub = row.row(align=True)
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
sub.active = linestyle.use_split_pattern
sub.prop(linestyle, "split_dash1", text="D1")
sub.prop(linestyle, "split_gap1", text="G1")
sub.prop(linestyle, "split_dash2", text="D2")
sub.prop(linestyle, "split_gap2", text="G2")
sub.prop(linestyle, "split_dash3", text="D3")
sub.prop(linestyle, "split_gap3", text="G3")
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Sorting
Freestyle: New line style options for sorting and chain selection. The following two sort keys are added for sorting chains. * Projected X - Sort by the projected X value in the image coordinate system. * Projected Y - Sort by the projected Y value in the image coordinate system. A new line style option for the selection of first N chains is also added. Moreover, the chain sorting and chain selection operations are now executed in this order instead of the reverse order used previously. The UI has also changed accordingly. This functional change is backward compatible and won't result in visual differences.
2014-10-01 06:42:37 +00:00
layout.prop(linestyle, "use_sorting", text="Sorting:")
col = layout.column()
col.active = linestyle.use_sorting
row = col.row(align=True)
row.prop(linestyle, "sort_key", text="")
sub = row.row()
sub.active = linestyle.sort_key in {'DISTANCE_FROM_CAMERA',
'PROJECTED_X',
'PROJECTED_Y'}
sub.prop(linestyle, "integration_type", text="")
row = col.row(align=True)
row.prop(linestyle, "sort_order", expand=True)
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Selection
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
layout.label(text="Selection:")
split = layout.split(align=True)
# First column
col = split.column()
row = col.row(align=True)
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
row.prop(linestyle, "use_length_min", text="")
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
sub = row.row()
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
sub.active = linestyle.use_length_min
sub.prop(linestyle, "length_min")
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
row = col.row(align=True)
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
row.prop(linestyle, "use_length_max", text="")
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
sub = row.row()
rna attribute consistency edits, use common prefix for booleans.
2013-04-23 07:06:29 +00:00
sub.active = linestyle.use_length_max
sub.prop(linestyle, "length_max")
Freestyle: New line style options for sorting and chain selection. The following two sort keys are added for sorting chains. * Projected X - Sort by the projected X value in the image coordinate system. * Projected Y - Sort by the projected Y value in the image coordinate system. A new line style option for the selection of first N chains is also added. Moreover, the chain sorting and chain selection operations are now executed in this order instead of the reverse order used previously. The UI has also changed accordingly. This functional change is backward compatible and won't result in visual differences.
2014-10-01 06:42:37 +00:00
# Second column
col = split.column()
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 05:59:02 +00:00
row = col.row(align=True)
Freestyle: New line style options for sorting and chain selection. The following two sort keys are added for sorting chains. * Projected X - Sort by the projected X value in the image coordinate system. * Projected Y - Sort by the projected Y value in the image coordinate system. A new line style option for the selection of first N chains is also added. Moreover, the chain sorting and chain selection operations are now executed in this order instead of the reverse order used previously. The UI has also changed accordingly. This functional change is backward compatible and won't result in visual differences.
2014-10-01 06:42:37 +00:00
row.prop(linestyle, "use_chain_count", text="")
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 05:59:02 +00:00
sub = row.row()
Freestyle: New line style options for sorting and chain selection. The following two sort keys are added for sorting chains. * Projected X - Sort by the projected X value in the image coordinate system. * Projected Y - Sort by the projected Y value in the image coordinate system. A new line style option for the selection of first N chains is also added. Moreover, the chain sorting and chain selection operations are now executed in this order instead of the reverse order used previously. The UI has also changed accordingly. This functional change is backward compatible and won't result in visual differences.
2014-10-01 06:42:37 +00:00
sub.active = linestyle.use_chain_count
sub.prop(linestyle, "chain_count")
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 05:59:02 +00:00
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Caps
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
layout.label(text="Caps:")
row = layout.row(align=True)
row.prop(linestyle, "caps", expand=True)
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
# Dashed lines
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 f60a66f41784de388a01c4c882c969730d675375).
2014-04-18 06:11:20 +00:00
layout.prop(linestyle, "use_dashed_line", text="Dashed Line:")
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
row = layout.row(align=True)
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 f60a66f41784de388a01c4c882c969730d675375).
2014-04-18 06:11:20 +00:00
row.active = linestyle.use_dashed_line
row.prop(linestyle, "dash1", text="D1")
row.prop(linestyle, "gap1", text="G1")
row.prop(linestyle, "dash2", text="D2")
row.prop(linestyle, "gap2", text="G2")
row.prop(linestyle, "dash3", text="D3")
row.prop(linestyle, "gap3", text="G3")
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
elif linestyle.panel == 'COLOR':
col = layout.column()
row = col.row()
row.label(text="Base Color:")
row.prop(linestyle, "color", text="")
col.label(text="Modifiers:")
col.operator_menu_enum("scene.freestyle_color_modifier_add", "type", text="Add Modifier")
for modifier in linestyle.color_modifiers:
self.draw_color_modifier(context, modifier)
elif linestyle.panel == 'ALPHA':
col = layout.column()
row = col.row()
row.label(text="Base Transparency:")
row.prop(linestyle, "alpha")
col.label(text="Modifiers:")
col.operator_menu_enum("scene.freestyle_alpha_modifier_add", "type", text="Add Modifier")
for modifier in linestyle.alpha_modifiers:
self.draw_alpha_modifier(context, modifier)
elif linestyle.panel == 'THICKNESS':
col = layout.column()
row = col.row()
row.label(text="Base Thickness:")
row.prop(linestyle, "thickness")
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 14:27:58 +00:00
subcol = col.column()
subcol.active = linestyle.chaining == 'PLAIN' and linestyle.use_same_object
row = subcol.row()
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
row.prop(linestyle, "thickness_position", expand=True)
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 14:27:58 +00:00
row = subcol.row()
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
row.prop(linestyle, "thickness_ratio")
row.active = (linestyle.thickness_position == 'RELATIVE')
col = layout.column()
col.label(text="Modifiers:")
col.operator_menu_enum("scene.freestyle_thickness_modifier_add", "type", text="Add Modifier")
for modifier in linestyle.thickness_modifiers:
self.draw_thickness_modifier(context, modifier)
elif linestyle.panel == 'GEOMETRY':
col = layout.column()
col.label(text="Modifiers:")
col.operator_menu_enum("scene.freestyle_geometry_modifier_add", "type", text="Add Modifier")
for modifier in linestyle.geometry_modifiers:
self.draw_geometry_modifier(context, modifier)
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 09:51:53 +00:00
elif linestyle.panel == 'TEXTURE':
layout.separator()
row = layout.row()
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
row.prop(linestyle, "use_nodes")
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 09:51:53 +00:00
row.prop(linestyle, "texture_spacing", text="Spacing Along Stroke")
row = layout.row()
UI: consistent naming for operator props
2015-05-10 05:23:41 +00:00
props = row.operator(
Cleanup: pep8 Use 'autopep8 --ignore E721,E722' on our UI code, only minor changes.
2018-06-05 14:32:11 +00:00
"wm.properties_context_change",
text="Go to Linestyle Textures Properties",
icon='TEXTURE',
)
UI: consistent naming for operator props
2015-05-10 05:23:41 +00:00
props.context = 'TEXTURE'
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 09:51:53 +00:00
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
elif linestyle.panel == 'MISC':
pass
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 06:54:46 +00:00
# Material properties
cleanup: pep8 also remove empty class parenthesis
2015-01-29 04:35:06 +00:00
class MaterialFreestyleButtonsPanel:
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 06:54:46 +00:00
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
bl_context = "material"
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
@classmethod
def poll(cls, context):
scene = context.scene
material = context.material
with_freestyle = bpy.app.build_options.freestyle
return with_freestyle and material and scene and scene.render.use_freestyle and \
Workspaces: remove workspace engine, use 3D viewport draw mode instead. ViewRender was removed, which means we can't get the render engine for files saved in 2.8. We assume that any files saved in 2.8 were intended to use Eevee and set the engine to that. A fix included with this is that .blend thumbails now draw with Clay mode, and never Eevee or Cycles. These were drawn with solid mode in 2.7, and should be very fast and not e.g. load heavy image textures. Differential Revision: https://developer.blender.org/D3156
2018-04-17 11:35:05 +00:00
(context.engine in cls.COMPAT_ENGINES)
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 06:54:46 +00:00
class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel):
bl_label = "Freestyle Line"
bl_options = {'DEFAULT_CLOSED'}
Remove Blender Internal and legacy viewport from Blender 2.8. Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-19 15:34:44 +00:00
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
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 06:54:46 +00:00
def draw(self, context):
layout = self.layout
mat = context.material
row = layout.row()
row.prop(mat, "line_color", text="")
row.prop(mat, "line_priority", text="Priority")
Add missing classes from recent commit
2017-03-19 15:07:24 +00:00
classes = (
Moving classes to separate listing broke panel order Although this wasn't so obvious since it only showed up for factory settings and in the preferences window. Panel display order depends on registration order, Sorry for the noise. On the bright side we no longer need to move classes around to re-arrange panels.
2017-03-19 15:34:32 +00:00
RENDER_PT_freestyle,
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
VIEWLAYER_UL_linesets,
Moving classes to separate listing broke panel order Although this wasn't so obvious since it only showed up for factory settings and in the preferences window. Panel display order depends on registration order, Sorry for the noise. On the bright side we no longer need to move classes around to re-arrange panels.
2017-03-19 15:34:32 +00:00
RENDER_MT_lineset_specials,
Rename any instance of scene layer or render layer in code with view layer The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22 12:52:39 +00:00
VIEWLAYER_PT_freestyle,
VIEWLAYER_PT_freestyle_lineset,
VIEWLAYER_PT_freestyle_linestyle,
Moving classes to separate listing broke panel order Although this wasn't so obvious since it only showed up for factory settings and in the preferences window. Panel display order depends on registration order, Sorry for the noise. On the bright side we no longer need to move classes around to re-arrange panels.
2017-03-19 15:34:32 +00:00
MATERIAL_PT_freestyle_line,
Add missing classes from recent commit
2017-03-19 15:07:24 +00:00
)
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
if __name__ == "__main__": # only for live edit.
PyAPI: remove bpy.utils.register_module() In preparation for it being removed, see: T47811
2017-03-18 09:03:24 +00:00
from bpy.utils import register_class
for cls in classes:
register_class(cls)
Copy Permalink