[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29462] branches/soc-2010-kwk: tuesday merge 29302:29458

Konrad Kleine konrad at konradwilhelm.de
Tue Jun 15 10:39:08 CEST 2010


Revision: 29462
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29462
Author:   kwk
Date:     2010-06-15 10:39:07 +0200 (Tue, 15 Jun 2010)

Log Message:
-----------
tuesday merge 29302:29458

Modified Paths:
--------------
    branches/soc-2010-kwk/CMakeLists.txt
    branches/soc-2010-kwk/config/linuxcross-config.py
    branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py
    branches/soc-2010-kwk/release/scripts/io/export_3ds.py
    branches/soc-2010-kwk/release/scripts/io/export_fbx.py
    branches/soc-2010-kwk/release/scripts/io/export_mdd.py
    branches/soc-2010-kwk/release/scripts/io/export_obj.py
    branches/soc-2010-kwk/release/scripts/io/export_ply.py
    branches/soc-2010-kwk/release/scripts/io/export_x3d.py
    branches/soc-2010-kwk/release/scripts/io/import_anim_bvh.py
    branches/soc-2010-kwk/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-kwk/release/scripts/io/import_scene_obj.py
    branches/soc-2010-kwk/release/scripts/io/import_shape_mdd.py
    branches/soc-2010-kwk/release/scripts/io/netrender/operators.py
    branches/soc-2010-kwk/release/scripts/io/netrender/utils.py
    branches/soc-2010-kwk/release/scripts/modules/add_object_utils.py
    branches/soc-2010-kwk/release/scripts/modules/bpy/utils.py
    branches/soc-2010-kwk/release/scripts/modules/bpy_types.py
    branches/soc-2010-kwk/release/scripts/modules/graphviz_export.py
    branches/soc-2010-kwk/release/scripts/modules/rna_prop_ui.py
    branches/soc-2010-kwk/release/scripts/op/console_python.py
    branches/soc-2010-kwk/release/scripts/op/image.py
    branches/soc-2010-kwk/release/scripts/op/object.py
    branches/soc-2010-kwk/release/scripts/op/presets.py
    branches/soc-2010-kwk/release/scripts/op/sequencer.py
    branches/soc-2010-kwk/release/scripts/op/uv.py
    branches/soc-2010-kwk/release/scripts/op/wm.py
    branches/soc-2010-kwk/release/scripts/presets/interaction/maya.py
    branches/soc-2010-kwk/release/scripts/templates/operator.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-kwk/release/scripts/ui/properties_game.py
    branches/soc-2010-kwk/release/scripts/ui/properties_object.py
    branches/soc-2010-kwk/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-kwk/release/scripts/ui/properties_render.py
    branches/soc-2010-kwk/release/scripts/ui/properties_scene.py
    branches/soc-2010-kwk/release/scripts/ui/space_info.py
    branches/soc-2010-kwk/release/scripts/ui/space_logic.py
    branches/soc-2010-kwk/release/scripts/ui/space_node.py
    branches/soc-2010-kwk/release/scripts/ui/space_sequencer.py
    branches/soc-2010-kwk/release/scripts/ui/space_text.py
    branches/soc-2010-kwk/release/scripts/ui/space_userpref.py
    branches/soc-2010-kwk/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2010-kwk/release/scripts/ui/space_view3d.py
    branches/soc-2010-kwk/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-kwk/source/Makefile
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_softbody.h
    branches/soc-2010-kwk/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/idprop.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/object.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/softbody.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2010-kwk/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-kwk/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-kwk/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2010-kwk/source/blender/editors/curve/curve_intern.h
    branches/soc-2010-kwk/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-kwk/source/blender/editors/curve/editcurve.c
    branches/soc-2010-kwk/source/blender/editors/curve/editfont.c
    branches/soc-2010-kwk/source/blender/editors/include/ED_object.h
    branches/soc-2010-kwk/source/blender/editors/interface/interface_panel.c
    branches/soc-2010-kwk/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-kwk/source/blender/editors/mesh/editmesh.c
    branches/soc-2010-kwk/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-kwk/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-kwk/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-kwk/source/blender/editors/object/object_add.c
    branches/soc-2010-kwk/source/blender/editors/object/object_intern.h
    branches/soc-2010-kwk/source/blender/editors/object/object_modifier.c
    branches/soc-2010-kwk/source/blender/editors/object/object_ops.c
    branches/soc-2010-kwk/source/blender/editors/object/object_relations.c
    branches/soc-2010-kwk/source/blender/editors/object/object_transform.c
    branches/soc-2010-kwk/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-kwk/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-kwk/source/blender/editors/render/render_shading.c
    branches/soc-2010-kwk/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-kwk/source/blender/editors/screen/screendump.c
    branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2010-kwk/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_console/space_console.c
    branches/soc-2010-kwk/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_file/file_panels.c
    branches/soc-2010-kwk/source/blender/editors/space_file/filesel.c
    branches/soc-2010-kwk/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-kwk/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_image/space_image.c
    branches/soc-2010-kwk/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_node/node_draw.c
    branches/soc-2010-kwk/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-kwk/source/blender/editors/space_node/node_intern.h
    branches/soc-2010-kwk/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_node/node_state.c
    branches/soc-2010-kwk/source/blender/editors/space_node/space_node.c
    branches/soc-2010-kwk/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-kwk/source/blender/editors/space_script/script_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-kwk/source/blender/editors/space_text/space_text.c
    branches/soc-2010-kwk/source/blender/editors/space_text/text_draw.c
    branches/soc-2010-kwk/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-kwk/source/blender/editors/transform/transform_ops.c
    branches/soc-2010-kwk/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-kwk/source/blender/makesrna/RNA_access.h
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_text.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-kwk/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-kwk/source/blender/python/generic/mathutils.c
    branches/soc-2010-kwk/source/blender/python/intern/bpy.c
    branches/soc-2010-kwk/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-kwk/source/blender/render/intern/include/render_types.h
    branches/soc-2010-kwk/source/blender/windowmanager/WM_api.h
    branches/soc-2010-kwk/source/blender/windowmanager/WM_types.h
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-kwk/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2010-kwk/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-kwk/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.types.rst

Added Paths:
-----------
    branches/soc-2010-kwk/doc/blender.1

Modified: branches/soc-2010-kwk/CMakeLists.txt
===================================================================
--- branches/soc-2010-kwk/CMakeLists.txt	2010-06-15 07:50:11 UTC (rev 29461)
+++ branches/soc-2010-kwk/CMakeLists.txt	2010-06-15 08:39:07 UTC (rev 29462)
@@ -43,6 +43,10 @@
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+# quiet output for Makefiles, 'make -s' helps too
+# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+
 PROJECT(Blender)
 
 #-----------------------------------------------------------------------------
@@ -144,7 +148,6 @@
 
 IF(UNIX AND NOT APPLE)
 
-
 	IF(WITH_OPENAL)
 		FIND_PACKAGE(OpenAL)
 		IF(NOT OPENAL_FOUND)
@@ -166,21 +169,24 @@
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
 	ENDIF(WITH_SNDFILE)
 
-	FIND_LIBRARY(INTL_LIBRARY
-		NAMES intl
-		PATHS
-		/sw/lib
-	)
-	FIND_LIBRARY(ICONV_LIBRARY
-		NAMES iconv
-		PATHS
-		/sw/lib
-	)
-  
-	IF(INTL_LIBRARY AND ICONV_LIBRARY)
-		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	IF(WITH_INTERNATIONAL)
+		FIND_LIBRARY(INTL_LIBRARY
+			NAMES intl
+			PATHS
+			/sw/lib
+		)
 
+		FIND_LIBRARY(ICONV_LIBRARY
+			NAMES iconv
+			PATHS
+			/sw/lib
+		)
+
+		IF(INTL_LIBRARY AND ICONV_LIBRARY)
+			SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+		ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	ENDIF(WITH_INTERNATIONAL)
+
 	FIND_PACKAGE(Freetype)
 	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
@@ -323,10 +329,12 @@
 	
 	ADD_DEFINITIONS(-DWIN32)
 
-	SET(ICONV ${LIBDIR}/iconv)
-	SET(ICONV_INC ${ICONV}/include)
-	SET(ICONV_LIB iconv)
-	SET(ICONV_LIBPATH ${ICONV}/lib)
+	IF(WITH_INTERNATIONAL)
+		SET(ICONV ${LIBDIR}/iconv)
+		SET(ICONV_INC ${ICONV}/include)
+		SET(ICONV_LIB iconv)
+		SET(ICONV_LIBPATH ${ICONV}/lib)
+	ENDIF(WITH_INTERNATIONAL)
 
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
 	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
@@ -404,14 +412,16 @@
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
 		ENDIF(WITH_OPENMP)
 		
-		SET(GETTEXT ${LIBDIR}/gettext)
-		SET(GETTEXT_INC ${GETTEXT}/include)
-		SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
-		IF(CMAKE_CL_64)
-			SET(GETTEXT_LIB gettext)
-		ELSE(CMAKE_CL_64)
-			SET(GETTEXT_LIB gnu_gettext)
-		ENDIF(CMAKE_CL_64)
+		IF(WITH_INTERNATIONAL)
+			SET(GETTEXT ${LIBDIR}/gettext)
+			SET(GETTEXT_INC ${GETTEXT}/include)
+			SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+			IF(CMAKE_CL_64)
+				SET(GETTEXT_LIB gettext)
+			ELSE(CMAKE_CL_64)
+				SET(GETTEXT_LIB gnu_gettext)
+			ENDIF(CMAKE_CL_64)
+		ENDIF(WITH_INTERNATIONAL)
 
 		IF(CMAKE_CL_64)
 			SET(PNG_LIBRARIES libpng)
@@ -526,10 +536,12 @@
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 		ENDIF(WITH_OPENMP)
 
-		SET(GETTEXT ${LIBDIR}/gcc/gettext)
-		SET(GETTEXT_INC ${GETTEXT}/include)
-		SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
-		SET(GETTEXT_LIB intl)
+		IF(WITH_INTERNATIONAL)
+			SET(GETTEXT ${LIBDIR}/gcc/gettext)
+			SET(GETTEXT_INC ${GETTEXT}/include)
+			SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+			SET(GETTEXT_LIB intl)
+		ENDIF(WITH_INTERNATIONAL)
 
 		SET(JPEG_LIBRARY jpeg)
 		SET(PNG_LIBRARIES png)
@@ -818,11 +830,12 @@
 	
 #-----------------------------------------------------------------------------
 # Common.
+IF(WITH_OPENJPEG)
+	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+	set(OPENJPEG_INC ${OPENJPEG})
+	set(OPENJPEG_LIb extern_libopenjpeg)
+ENDIF(WITH_OPENJPEG)
 
-set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
-set(OPENJPEG_INC ${OPENJPEG})
-set(OPENJPEG_LIb extern_libopenjpeg)
-
 #-----------------------------------------------------------------------------
 # Blender WebPlugin
 

Modified: branches/soc-2010-kwk/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-kwk/config/linuxcross-config.py	2010-06-15 07:50:11 UTC (rev 29461)
+++ branches/soc-2010-kwk/config/linuxcross-config.py	2010-06-15 08:39:07 UTC (rev 29462)
@@ -153,7 +153,7 @@
 BF_OPENGL_LIB = 'opengl32 glu32'
 BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
 
-WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
 BF_OPENMP = LIBDIR + '/gcc/gomp'
 BF_OPENMP_INC = '${BF_OPENMP}/include'
 BF_OPENMP_LIBPATH = '${BF_OPENMP}/lib'

Copied: branches/soc-2010-kwk/doc/blender.1 (from rev 29458, trunk/blender/doc/blender.1)
===================================================================
--- branches/soc-2010-kwk/doc/blender.1	                        (rev 0)
+++ branches/soc-2010-kwk/doc/blender.1	2010-06-15 08:39:07 UTC (rev 29462)
@@ -0,0 +1,232 @@
+.TH "BLENDER" "1" "June 06, 2010" "Blender 2\&.5\&.2"
+.SH NAME
+blender \- a 3D modelling and rendering package
+.SH SYNOPSIS
+.B blender [args ...] [file] [args ...]
+
+
+.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
+.SH OPTIONS
+.SS "Render options:"
+
+.TP
+.B \-b, \-\-background <file>
+Load <file> in background (often used for UI-less rendering)
+
+.TP
+.B \-a, \-\-render-anim 
+Render frames from start to end (inclusive)
+
+.TP
+.B \-S, \-\-scene <name>
+Set the active scene <name> for rendering
+
+.TP
+.B \-f, \-\-render-frame <frame>
+Render frame <frame> and save it
+
+.TP
+.B \-s, \-\-frame-start <frame>
+Set start to frame <frame> (use before the \-a argument)
+
+.TP
+.B \-e, \-\-frame-end <frame>
+Set end to frame <frame> (use before the \-a argument)
+
+.TP
+.B \-j, \-\-frame-jump <frames>
+Set number of frames to step forward after each rendered frame
+
+.TP
+.B \-o, --render-output <path>
+Set the render path and file name.
+.IP
+Use // at the start of the path to render relative to the blend file.
+.IP
+The # characters are replaced by the frame number, and used to define zero padding.
+.IP
+    ani_##_test.png becomes ani_01_test.png
+    test-######.png becomes test-000001.png
+    When the filename does not contain #, The suffix #### is added to the filename
+.IP
+The frame number will be added at the end of the filename.
+    eg: blender -b foobar.blend -o //render_ -F PNG -x 1 -a
+    //render_ becomes //render_####, writing frames as //render_0001.png//
+
+.HP
+.B \-E, \-\-engine <engine>
+Specify the render engine
+use \fI\-E help\fR to list available engines
+
+.SS "Format options:"
+
+.TP
+.B \-F, \-\-render-format <format>
+Set the render format, valid options are...
+.IP
+TGA IRIS JPEG MOVIE IRIZ RAWTGA
+AVIRAW AVIJPEG PNG BMP FRAMESERVER
+.IP
+(formats that can be compiled into blender, not available on all systems)
+.IP
+HDR TIFF EXR MULTILAYER MPEG AVICODEC QUICKTIME CINEON DPX DDS
+
+.TP
+.B \-x, \-\-use-extension <bool>
+Set option to add the file extension to the end of the file
+
+.TP
+.B \-t, \-\-threads <threads>
+Use amount of <threads> for rendering in background
+[1-BLENDER_MAX_THREADS], 0 for systems processor count.
+
+.SS "Animation options:"
+
+.TP
+.B \-a <options> <file(s)>
+Playback <file(s)>, only operates this way when not running in background.
+.IP
+\-p <sx> <sy> \-\- Open with lower left corner at <sx>, <sy>
+.br
+\-m  \-\- Read from disk (Don't buffer)
+.br
+\-f <fps> <fps-base> \-\- Specify FPS to start with
+.br
+\-j <frame> \-\- Set frame step to <frame>
+
+.SS "Window options:"
+
+.TP
+.B \-w, \-\-window-border
+Force opening with borders (default)
+
+.TP
+.B \-W, \-\-window-borderless
+Force opening with without borders
+
+.TP
+.B \-p, --window-geometry <sx> <sy> <w> <h>
+Open with lower left corner at <sx>, <sy> and width and height <w>, <h>
+
+.SS "Game Engine specific options:"
+.TP
+.B \-g fixedtime
+Run on 50 hertz without dropping frames
+.TP
+.B \-g vertexarrays
+Use Vertex Arrays for rendering (usually faster)
+.TP
+.B \-g nomipmap
+No Texture Mipmapping
+.TP
+.B \-g linearmipmap
+Linear Texture Mipmapping instead of Nearest (default)
+.SS "Misc options:"
+.TP
+.B \-d, \-\-debug
+Turn debugging on
+.IP
+Prints every operator call and their arguments
+.br
+Disables mouse grab (to interact with a debugger in some cases)
+.br
+Keeps python sys.stdin rather then setting it to None
+
+.TP
+.B \--debug-fpe 
+Enable floating point exceptions
+
+.TP
+.B \-noaudio
+Disable audio on systems that support audio
+
+.TP
+.B \-nojoystick 
+Disable joystick support
+
+.TP
+.B \-noglsl 
+Disable GLSL shading
+
+.TP
+.B \-y, \-\-enable-autoexec 
+Enable automatic python script execution (default)
+
+.TP
+.B \-Y, \-\-disable-autoexec 
+Disable automatic python script execution (pydrivers, pyconstraints, pynodes)
+
+.TP
+.B \-P <filename>
+Run the given Python script (filename or Blender Text)
+
+.TP
+.B \-\-python-console 
+Run blender with an interactive console
+
+.TP
+.B \-v, \-\-version 
+Print Blender version and exit
+
+.TP
+.B \-\- 
+Ends option processing, following arguments passed unchanged. Access via python's sys.argv
+
+.TP
+.B \-h, \-\-help 
+Show a summary of options.
+
+.SH "ENVIRONMENT VARIABLES"
+
+.PP
+\fIHOME\fR
+.RS 4
+Store files such as .blender/ .B.blend .Bfs .Blog here.
+.RE
+
+.PP
+\fIBLENDERPATH\fR
+.RS 4
+System directory to use for data files and scripts.
+For this build of blender the default BLENDERPATH is...
+"/usr/share/blender"
+setting the $BLENDERPATH will override this
+.RE
+
+.PP
+\fITMP\fR or \fITMPDIR\fR
+.RS 4
+Store temporary files here.
+.RE
+
+.PP
+\fISDL_AUDIODRIVER\fR
+.RS 4
+LibSDL audio driver - alsa, esd, alsa, dma.
+.RE
+
+.PP
+\fIPYTHONHOME\fR
+.RS 4
+Path to the python directory, eg. /usr/lib/python.
+.RE
+
+.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-kwk/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py	2010-06-15 07:50:11 UTC (rev 29461)
+++ branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py	2010-06-15 08:39:07 UTC (rev 29462)
@@ -762,12 +762,22 @@
 
         if 1:

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list