diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-02-14 12:01:16 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-02-14 12:01:16 +0300 |
| commit | 2b83d33032583309f942899b77da6208d1b4c00d (patch) | |
| tree | 8b1ba2303060567f453b75af8fdfd513f79b8f97 /release/scripts | |
| parent | 4526aa70e5cd0c6947810892f39238cab67ffffd (diff) | |
| parent | f621f03e4b252d5ef1d86b9306a22628da3160ce (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/modules/bpy_types.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 4c47b5a5fb6..a30f9d1dd1d 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -29,6 +29,7 @@ bpy_types.BlendDataLibraries.load = _bpy._library_load bpy_types.BlendDataLibraries.write = _bpy._library_write bpy_types.BlendData.user_map = _bpy._rna_id_collection_user_map bpy_types.BlendData.batch_remove = _bpy._rna_id_collection_batch_remove +bpy_types.BlendData.orphans_purge = _bpy._rna_id_collection_orphans_purge class Context(StructRNA): diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 5fc03e59f9d..f70789ebeed 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -126,6 +126,7 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): row = layout.row() layout.prop(freestyle, "mode", text="Control Mode") layout.prop(freestyle, "use_view_map_cache", text="View Map Cache") + layout.prop(freestyle, "as_render_pass", text="As Render Pass") layout.label(text="Edge Detection Options:") split = layout.split() |