[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29761] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29687 :29760
Brecht Van Lommel
brecht at blender.org
Mon Jun 28 12:04:01 CEST 2010
Revision: 29761
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29761
Author: blendix
Date: 2010-06-28 12:04:00 +0200 (Mon, 28 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29687:29760
Modified Paths:
--------------
branches/render25/doc/blender.1
branches/render25/release/scripts/io/export_3ds.py
branches/render25/release/scripts/io/import_scene_3ds.py
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/properties_object.py
branches/render25/release/scripts/ui/properties_physics_cloth.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/properties_world.py
branches/render25/release/scripts/ui/space_logic.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_userpref_keymap.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/BKE_mball.h
branches/render25/source/blender/blenkernel/BKE_scene.h
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/mball.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/packedFile.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenlib/intern/BLI_bfile.c
branches/render25/source/blender/editors/animation/anim_ops.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/include/ED_keyframing.h
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/metaball/mball_edit.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/space_action/action_edit.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesdna/DNA_userdef_types.h
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/modifiers/intern/MOD_build.c
branches/render25/source/blender/modifiers/intern/MOD_collision.c
branches/render25/source/blender/modifiers/intern/MOD_explode.c
branches/render25/source/blender/modifiers/intern/MOD_wave.c
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/doc/sphinx_doc_gen.sh
branches/render25/source/blender/python/intern/bpy_driver.c
branches/render25/source/blender/render/intern/include/render_types.h
branches/render25/source/blender/render/intern/source/convertblender.c
branches/render25/source/blender/render/intern/source/object_particle.c
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/texture_pointdensity.c
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blender/windowmanager/intern/wm_keymap.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/creator/creator.c
Added Paths:
-----------
branches/render25/doc/blender.1.py
branches/render25/source/blender/python/doc/examples/bpy.data.py
Modified: branches/render25/doc/blender.1
===================================================================
(Binary files differ)
Copied: branches/render25/doc/blender.1.py (from rev 29760, trunk/blender/doc/blender.1.py)
===================================================================
--- branches/render25/doc/blender.1.py (rev 0)
+++ branches/render25/doc/blender.1.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -0,0 +1,134 @@
+#!/usr/bin/python
+
+# ##### 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 subprocess
+import os
+
+import time
+import datetime
+
+
+def man_format(data):
+ data = data.replace("-", "\\-")
+ data = data.replace("\t", " ")
+ # data = data.replace("$", "\\fI")
+
+ data_ls = []
+ for w in data.split():
+ if w.startswith("$"):
+ w = "\\fI" + w[1:] + "\\fR"
+
+ data_ls.append(w)
+
+ data = data[:len(data) - len(data.lstrip())] + " ".join(data_ls)
+
+ return data
+
+
+blender_bin = os.path.join(os.path.dirname(__file__), "../blender")
+
+blender_help = subprocess.Popen([blender_bin, "--help"], stdout=subprocess.PIPE).communicate()[0].decode()
+
+blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode().strip()
+blender_version = blender_version.split("Build")[0]
+
+date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
+
+filepath = __file__.replace(".py", "")
+
+file = open(filepath, "w")
+
+fw = file.write
+
+fw('.TH "BLENDER" "1" "%s" "Blender %s"\n' % (date_string, blender_version.replace(".", "\\&.")))
+
+fw('''
+.SH NAME
+blender \- a 3D modelling and rendering package''')
+
+fw('''
+.SH SYNOPSIS
+.B blender [args ...] [file] [args ...]''')
+
+fw('''
+.br
+.SH DESCRIPTION
+.PP
+.B blender
+is a 3D modelling and rendering package. It is the in-house software of a high quality animation studio, Blender has proven to be an extremely fast and versatile design instrument. The software has a personal touch, offering a unique approach to the world of Three Dimensions.
+
+Use Blender to create TV commercials, to make technical visualizations, business graphics, to do some morphing, or design user interfaces. You can easy build and manage complex environments. The renderer is versatile and extremely fast. All basic animation principles (curves & keys) are well implemented.
+
+http://www.blender.org''')
+
+fw('''
+.SH OPTIONS''')
+
+fw("\n\n")
+
+lines = [line.rstrip() for line in blender_help.split("\n")]
+
+while lines:
+ l = lines.pop(0)
+ if l.startswith("Environment Variables:"):
+ fw('.SH "ENVIRONMENT VARIABLES"\n')
+ elif l.endswith(":"): # one line
+ fw('.SS "%s"\n\n' % l)
+ elif l.startswith("-") or l.startswith("/"): # can be multi line
+
+ fw('.TP\n')
+ fw('.B %s\n' % man_format(l))
+
+ while lines:
+ # line with no
+ if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): # no white space
+ break
+
+ if not l: # second blank line
+ fw('.IP\n')
+ else:
+ fw('.br\n')
+
+ l = lines.pop(0)
+ l = l[1:] # remove first whitespace (tab)
+
+ fw('%s\n' % man_format(l))
+
+ else:
+ if not l.strip():
+ fw('.br\n')
+ else:
+ fw('%s\n' % man_format(l))
+
+# footer
+
+fw('''
+.br
+.SH SEE ALSO
+.B yafaray(1)
+
+.br
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux system by Daniel Mester
+<mester at uni-bremen.de> and updated by Cyril Brulebois
+<cyril.brulebois at enst-bretagne.fr> and Dan Eicher <dan at trollwerks.org>.
+''')
Modified: branches/render25/release/scripts/io/export_3ds.py
===================================================================
--- branches/render25/release/scripts/io/export_3ds.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/io/export_3ds.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -1122,7 +1122,6 @@
# to the class instance from the operator settings before calling.
- # filename = StringProperty(name="File Name", description="File name used for exporting the 3DS file", maxlen= 1024, default= ""),
filepath = StringProperty(name="File Path", description="Filepath used for exporting the 3DS file", maxlen= 1024, default= "")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
Modified: branches/render25/release/scripts/io/import_scene_3ds.py
===================================================================
--- branches/render25/release/scripts/io/import_scene_3ds.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/io/import_scene_3ds.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -1013,8 +1013,6 @@
# to the class instance from the operator settings before calling.
filepath = StringProperty(name="File Path", description="Filepath used for importing the 3DS file", maxlen= 1024, default= "")
- filename = StringProperty(name="File Name", description="Name of the file.")
- directory = StringProperty(name="Directory", description="Directory of the file.")
# size_constraint = FloatProperty(name="Size Constraint", description="Scale the model by 10 until it reacehs the size constraint. Zero Disables.", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=10.0),
# search_images = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True),
Modified: branches/render25/release/scripts/ui/properties_data_curve.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_curve.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/ui/properties_data_curve.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -395,7 +395,7 @@
col.prop(box, "x", text="X")
col.prop(box, "y", text="Y")
- row.operator("font.textbox_remove", text='', icon='X').index = i
+ row.operator("font.textbox_remove", text='', icon='X', emboss=False).index = i
classes = [
Modified: branches/render25/release/scripts/ui/properties_object.py
===================================================================
--- branches/render25/release/scripts/ui/properties_object.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/ui/properties_object.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -153,9 +153,9 @@
ob = context.object
wide_ui = context.region.width > narrowui
- split = layout.split(percentage=0.8, align=True)
- split.operator("object.group_link", text="Add to Group")
- split.operator("object.group_add", text="", icon='ZOOMIN')
+ row = layout.row(align=True)
+ row.operator("object.group_link", text="Add to Group")
+ row.operator("object.group_add", text="", icon='ZOOMIN')
# XXX, this is bad practice, yes, I wrote it :( - campbell
index = 0
@@ -168,7 +168,7 @@
row = col.box().row()
row.prop(group, "name", text="")
- row.operator("object.group_remove", text="", icon='X')
+ row.operator("object.group_remove", text="", icon='X', emboss=False)
split = col.box().split()
@@ -212,6 +212,7 @@
col.prop(ob, "draw_name", text="Name")
col.prop(ob, "draw_axis", text="Axis")
col.prop(ob, "draw_wire", text="Wire")
+ col.prop(ob, "color", text="")
if wide_ui:
col = split.column()
Modified: branches/render25/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_cloth.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/ui/properties_physics_cloth.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -87,7 +87,7 @@
col = split.column()
col.label(text="Presets:")
- sub = col.row(align=True).split(percentage=0.75)
+ sub = col.row(align=True)
sub.menu("CLOTH_MT_presets", text=bpy.types.CLOTH_MT_presets.bl_label)
sub.operator("cloth.preset_add", text="", icon="ZOOMIN")
Modified: branches/render25/release/scripts/ui/properties_render.py
===================================================================
--- branches/render25/release/scripts/ui/properties_render.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/ui/properties_render.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ -541,10 +541,9 @@
rd = scene.render
wide_ui = context.region.width > narrowui
- row = layout.row().split()
- sub = row.row(align=True).split(percentage=0.75)
- sub.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
- sub.operator("render.preset_add", text="", icon="ZOOMIN")
+ row = layout.row(align=True)
+ row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
+ row.operator("render.preset_add", text="", icon="ZOOMIN")
split = layout.split()
Modified: branches/render25/release/scripts/ui/properties_scene.py
===================================================================
--- branches/render25/release/scripts/ui/properties_scene.py 2010-06-28 07:21:54 UTC (rev 29760)
+++ branches/render25/release/scripts/ui/properties_scene.py 2010-06-28 10:04:00 UTC (rev 29761)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list