diff options
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 11 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 18 |
2 files changed, 22 insertions, 7 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 09e844adae3..72e92e5855f 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -262,6 +262,7 @@ else: "mathutils", "mathutils.geometry", "mathutils.noise", + "Freestyle", ] # ------ @@ -449,6 +450,7 @@ if ARGS.sphinx_build_pdf: ClassMethodDescriptorType = type(dict.__dict__['fromkeys']) MethodDescriptorType = type(dict.get) GetSetDescriptorType = type(int.real) +StaticMethodType = type(staticmethod(lambda: None)) from types import MemberDescriptorType _BPY_STRUCT_FAKE = "bpy_struct" @@ -915,6 +917,12 @@ def pymodule2sphinx(basepath, module_name, module, title): if type(descr) == GetSetDescriptorType: py_descr2sphinx(" ", fw, descr, module_name, type_name, key) + for key, descr in descr_items: + if type(descr) == StaticMethodType: + descr = getattr(value, key) + write_indented_lines(" ", fw, descr.__doc__ or "Undocumented", False) + fw("\n") + fw("\n\n") file.close() @@ -1547,7 +1555,7 @@ def write_rst_contents(basepath): # mathutils "mathutils", "mathutils.geometry", "mathutils.noise", # misc - "bgl", "blf", "gpu", "aud", "bpy_extras", + "Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras", # bmesh, submodules are in own page "bmesh", ) @@ -1695,6 +1703,7 @@ def write_rst_importable_modules(basepath): "mathutils" : "Math Types & Utilities", "mathutils.geometry": "Geometry Utilities", "mathutils.noise" : "Noise Utilities", + "Freestyle" : "Freestyle Data Types & Operators", } for mod_name, mod_descr in importable_modules.items(): if mod_name not in EXCLUDE_MODULES: diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 564a62f257d..d1d007079bb 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -244,16 +244,16 @@ class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel): class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): - bl_label = "Layer List" - bl_context = "render_layer" + bl_label = "Layers" bl_options = {'HIDE_HEADER'} + bl_context = "render_layer" + COMPAT_ENGINES = {'CYCLES'} def draw(self, context): layout = self.layout scene = context.scene rd = scene.render - rl = rd.layers.active row = layout.row() row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2) @@ -263,6 +263,7 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): col.operator("scene.render_layer_remove", icon='ZOOMOUT', text="") row = layout.row() + rl = rd.layers.active if rl: row.prop(rl, "name") row.prop(rd, "use_single_layer", text="", icon_only=True) @@ -270,7 +271,9 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel): bl_label = "Layer" + bl_options = {'DEFAULT_CLOSED'} bl_context = "render_layer" + COMPAT_ENGINES = {'CYCLES'} def draw(self, context): layout = self.layout @@ -287,7 +290,8 @@ class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel): col = split.column() col.prop(rl, "layers", text="Layer") - col.prop(rl, "layers_zmask", text="Mask Layer") + col.label(text="Mask Layers:") + col.prop(rl, "layers_zmask", text="") split = layout.split() @@ -301,9 +305,10 @@ class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel): class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel): - bl_label = "Passes" - bl_context = "render_layer" + bl_label = "Render Passes" bl_options = {'DEFAULT_CLOSED'} + bl_context = "render_layer" + COMPAT_ENGINES = {'CYCLES'} def draw(self, context): layout = self.layout @@ -315,6 +320,7 @@ class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel): split = layout.split() col = split.column() + col.label(text="Passes:") col.prop(rl, "use_pass_combined") col.prop(rl, "use_pass_z") col.prop(rl, "use_pass_normal") |