[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55868] trunk/blender: Missing updates in the doc/ and intern/ folders during the merger in revision 55847.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Apr 7 08:56:50 CEST 2013
Revision: 55868
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55868
Author: kjym3
Date: 2013-04-07 06:56:49 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
Missing updates in the doc/ and intern/ folders during the merger in revision 55847.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55847
Modified Paths:
--------------
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/intern/cycles/blender/addon/ui.py
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2013-04-07 06:44:33 UTC (rev 55867)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2013-04-07 06:56:49 UTC (rev 55868)
@@ -262,6 +262,7 @@
"mathutils",
"mathutils.geometry",
"mathutils.noise",
+ "Freestyle",
]
# ------
@@ -449,6 +450,7 @@
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 @@
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 @@
# 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 @@
"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:
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-07 06:44:33 UTC (rev 55867)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-04-07 06:56:49 UTC (rev 55868)
@@ -244,16 +244,16 @@
class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
- bl_label = "Layer List"
+ bl_label = "Layers"
+ bl_options = {'HIDE_HEADER'}
bl_context = "render_layer"
- bl_options = {'HIDE_HEADER'}
+ 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 @@
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_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 @@
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_passes(CyclesButtonsPanel, Panel):
- bl_label = "Passes"
+ bl_label = "Render Passes"
+ bl_options = {'DEFAULT_CLOSED'}
bl_context = "render_layer"
- bl_options = {'DEFAULT_CLOSED'}
+ COMPAT_ENGINES = {'CYCLES'}
def draw(self, context):
layout = self.layout
@@ -315,6 +320,7 @@
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")
More information about the Bf-blender-cvs
mailing list