[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29796] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29583 :29790

Nicholas Bishop nicholasbishop at gmail.com
Tue Jun 29 18:55:11 CEST 2010


Revision: 29796
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29796
Author:   nicholasbishop
Date:     2010-06-29 18:55:04 +0200 (Tue, 29 Jun 2010)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29583:29790

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/CMakeLists.txt
    branches/soc-2010-nicolasbishop/config/linux2-config.py
    branches/soc-2010-nicolasbishop/config/linuxcross-config.py
    branches/soc-2010-nicolasbishop/config/win32-vc-config.py
    branches/soc-2010-nicolasbishop/config/win64-vc-config.py
    branches/soc-2010-nicolasbishop/doc/blender.1
    branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
    branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_logic.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_time.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_displist.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_key.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_mball.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_paint.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_texture.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/action.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/key.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mesh.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/node.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_linklist.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_base.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_inline.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_bfile.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/noise.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/threads.c
    branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicolasbishop/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/Makefile
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/SConscript
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/editfont.c
    branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_screen.h
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_screen_types.h
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
    branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_object.c
    branches/soc-2010-nicolasbishop/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-nicolasbishop/source/blender/editors/render/render_internal.c
    branches/soc-2010-nicolasbishop/source/blender/editors/render/render_opengl.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_time/space_time.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
    branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/anim.c
    branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/targa.c
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/mathutils.py
    branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2010-nicolasbishop/source/blender/python/generic/geometry.c
    branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/include/render_types.h
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pointdensity.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/rayshade.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/texture.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_types.h
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/wm_event_types.h
    branches/soc-2010-nicolasbishop/source/creator/creator.c

Added Paths:
-----------
    branches/soc-2010-nicolasbishop/doc/blender.1.py
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_cpu.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/cpu.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_api_cleanup.txt
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/bpy.data.py

Removed Paths:
-------------
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_api_cleanup.txt
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner.py

Property Changed:
----------------
    branches/soc-2010-nicolasbishop/doc/blender.1
    branches/soc-2010-nicolasbishop/release/scripts/modules/blend_render_info.py

Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-06-29 16:55:04 UTC (rev 29796)
@@ -110,7 +110,7 @@
 OPTION(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
 
 # Misc
-OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" OFF) 
+OPTION(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 

Modified: branches/soc-2010-nicolasbishop/config/linux2-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/linux2-config.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/config/linux2-config.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -168,7 +168,7 @@
 WITH_BF_OPENMP = True
 
 #Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
 
 ##

Modified: branches/soc-2010-nicolasbishop/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/linuxcross-config.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/config/linuxcross-config.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -169,7 +169,7 @@
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
 
 #Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]

Modified: branches/soc-2010-nicolasbishop/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/win32-vc-config.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/config/win32-vc-config.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -150,7 +150,7 @@
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
 
 WITH_BF_STATICOPENGL = False

Modified: branches/soc-2010-nicolasbishop/config/win64-vc-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/win64-vc-config.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/config/win64-vc-config.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -163,7 +163,7 @@
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
 
 WITH_BF_STATICOPENGL = False

Modified: branches/soc-2010-nicolasbishop/doc/blender.1
===================================================================
(Binary files differ)


Property changes on: branches/soc-2010-nicolasbishop/doc/blender.1
___________________________________________________________________
Name: svn:mime-type
   + application/x-troff-man
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/soc-2010-nicolasbishop/doc/blender.1.py (from rev 29790, trunk/blender/doc/blender.1.py)
===================================================================
--- branches/soc-2010-nicolasbishop/doc/blender.1.py	                        (rev 0)
+++ branches/soc-2010-nicolasbishop/doc/blender.1.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -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/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -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/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py	2010-06-29 15:56:05 UTC (rev 29795)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py	2010-06-29 16:55:04 UTC (rev 29796)
@@ -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),


Property changes on: branches/soc-2010-nicolasbishop/release/scripts/modules/blend_render_info.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py	2010-06-29 15:56:05 UTC (rev 29795)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list