[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41577] branches/bmesh/blender: svn merge ^/trunk/blender -r41503:41575
Campbell Barton
ideasman42 at gmail.com
Sun Nov 6 11:38:46 CET 2011
Revision: 41577
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41577
Author: campbellbarton
Date: 2011-11-06 10:38:44 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41503:41575
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41503
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/cmake/project_info.py
branches/bmesh/blender/doc/doxygen/Doxyfile
branches/bmesh/blender/doc/doxygen/doxygen.source
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.h
branches/bmesh/blender/intern/ghost/intern/GHOST_Buttons.h
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManager.h
branches/bmesh/blender/intern/ghost/intern/GHOST_EventWheel.h
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenkernel/BKE_animsys.h
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata_file.h
branches/bmesh/blender/source/blender/blenkernel/BKE_depsgraph.h
branches/bmesh/blender/source/blender/blenkernel/BKE_lattice.h
branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
branches/bmesh/blender/source/blender/blenkernel/BKE_pointcache.h
branches/bmesh/blender/source/blender/blenkernel/BKE_property.h
branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
branches/bmesh/blender/source/blender/blenkernel/BKE_text.h
branches/bmesh/blender/source/blender/blenkernel/BKE_unit.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata_file.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/group.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/property.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/text.c
branches/bmesh/blender/source/blender/blenkernel/intern/unit.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_rotation.h
branches/bmesh/blender/source/blender/blenlib/intern/math_rotation.c
branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
branches/bmesh/blender/source/blender/blenlib/intern/uvproject.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/collada/CameraExporter.cpp
branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
branches/bmesh/blender/source/blender/editors/animation/anim_draw.c
branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
branches/bmesh/blender/source/blender/editors/armature/poseUtils.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
branches/bmesh/blender/source/blender/editors/include/ED_armature.h
branches/bmesh/blender/source/blender/editors/include/ED_fluidsim.h
branches/bmesh/blender/source/blender/editors/include/ED_logic.h
branches/bmesh/blender/source/blender/editors/include/ED_particle.h
branches/bmesh/blender/source/blender/editors/include/ED_transform.h
branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_transform.c
branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/render/render_view.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/util/editmode_undo.c
branches/bmesh/blender/source/blender/editors/util/undo.c
branches/bmesh/blender/source/blender/editors/util/util_intern.h
branches/bmesh/blender/source/blender/gpu/GPU_buffers.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
branches/bmesh/blender/source/blender/imbuf/intern/moviecache.c
branches/bmesh/blender/source/blender/makesdna/DNA_camera_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_camera_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_color.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_controller.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sensor.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.h
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/bmesh/blender/source/blender/python/generic/bgl.c
branches/bmesh/blender/source/blender/python/generic/bgl.h
branches/bmesh/blender/source/blender/python/generic/blf_py_api.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/generic/noise_py_api.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/blender/python/intern/bpy_app.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface_atexit.c
branches/bmesh/blender/source/blender/python/intern/bpy_intern_string.c
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_array.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_callback.c
branches/bmesh/blender/source/blender/python/intern/bpy_traceback.c
branches/bmesh/blender/source/blender/python/intern/bpy_util.c
branches/bmesh/blender/source/blender/python/intern/gpu.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/render/intern/include/texture.h
branches/bmesh/blender/source/blender/render/intern/source/envmap.c
branches/bmesh/blender/source/blender/render/intern/source/external_engine.c
branches/bmesh/blender/source/blender/render/intern/source/initrender.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.h
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureActuator.h
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.h
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/bmesh/blender/source/gameengine/Expressions/Expression.h
branches/bmesh/blender/source/gameengine/Expressions/ListValue.h
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/bmesh/blender/source/gameengine/Expressions/Value.cpp
branches/bmesh/blender/source/gameengine/Expressions/Value.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ANDController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_IController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_IObject.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_NANDController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_NORController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ORController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_XNORController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_XORController.h
branches/bmesh/blender/source/gameengine/Ketsji/BL_Shader.h
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_FontObject.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Light.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_MeshProxy.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_NearSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_ParentActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolyProxy.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_RadarSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_RaySensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SoundActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_StateActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_TouchSensor.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_VertexProxy.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_CameraData.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/bmesh/blender/source/gameengine/VideoTexture/ImageRender.cpp
Added Paths:
-----------
branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.1.py
branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.py
branches/bmesh/blender/release/scripts/presets/camera/
branches/bmesh/blender/release/scripts/presets/camera/APS-C_DSLR.py
branches/bmesh/blender/release/scripts/presets/camera/Blender.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1100D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1DS.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_500D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_550D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_5D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_600D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_60D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_7D.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D300S.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D3100.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D35.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D5000.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D5100.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D7000.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D90.py
branches/bmesh/blender/release/scripts/presets/camera/Red_Epic.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_2K.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_3K.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_4K.py
branches/bmesh/blender/release/scripts/presets/camera/full_frame_35mm_film.py
branches/bmesh/blender/release/scripts/presets/camera/micro_four_thirds.py
branches/bmesh/blender/release/scripts/presets/camera/super_16_film.py
branches/bmesh/blender/release/scripts/presets/camera/super_35_film.py
branches/bmesh/blender/source/blender/blenkernel/BKE_camera.h
branches/bmesh/blender/source/blender/blenkernel/BKE_lamp.h
branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
branches/bmesh/blender/source/blender/blenkernel/intern/lamp.c
Removed Paths:
-------------
branches/bmesh/blender/po/
branches/bmesh/blender/release/datafiles/locale/
branches/bmesh/blender/release/scripts/presets/camera/APS-C_DSLR.py
branches/bmesh/blender/release/scripts/presets/camera/Blender.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1100D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_1DS.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_500D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_550D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_5D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_600D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_60D.py
branches/bmesh/blender/release/scripts/presets/camera/Canon_7D.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D300S.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D3100.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D35.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D5000.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D5100.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D7000.py
branches/bmesh/blender/release/scripts/presets/camera/Nikon_D90.py
branches/bmesh/blender/release/scripts/presets/camera/Red_Epic.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_2K.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_3K.py
branches/bmesh/blender/release/scripts/presets/camera/Red_One_4K.py
branches/bmesh/blender/release/scripts/presets/camera/full_frame_35mm_film.py
branches/bmesh/blender/release/scripts/presets/camera/micro_four_thirds.py
branches/bmesh/blender/release/scripts/presets/camera/super_16_film.py
branches/bmesh/blender/release/scripts/presets/camera/super_35_film.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/release/datafiles/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41503
+ /trunk/blender:39992-41575
Added: svn:externals
+
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-11-06 09:42:23 UTC (rev 41576)
+++ branches/bmesh/blender/GNUmakefile 2011-11-06 10:38:44 UTC (rev 41577)
@@ -135,9 +135,6 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets (not assosiated with building blender)"
- @echo " * translations - update blenders translation files in po/"
- @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -151,6 +148,7 @@
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
+ @echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
@echo " * doc_man - generate manpage"
@echo ""
@@ -170,16 +168,6 @@
# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
- python3 po/update_pot.py
- python3 po/update_po.py
- python3 po/update_mo.py
-
-
-# -----------------------------------------------------------------------------
# Tests
#
test:
@@ -238,9 +226,13 @@
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
- cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+ cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
+doc_doxy:
+ cd doc/doxygen; doxygen
+ @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
+
doc_dna:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
Modified: branches/bmesh/blender/build_files/cmake/project_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-06 09:42:23 UTC (rev 41576)
+++ branches/bmesh/blender/build_files/cmake/project_info.py 2011-11-06 10:38:44 UTC (rev 41577)
@@ -234,4 +234,3 @@
if "/branches/" in l:
return prefix + l.rsplit("/branches/", 1)[-1].split("/", 1)[0]
return fallback
-
Modified: branches/bmesh/blender/doc/doxygen/Doxyfile
===================================================================
--- branches/bmesh/blender/doc/doxygen/Doxyfile 2011-11-06 09:42:23 UTC (rev 41576)
+++ branches/bmesh/blender/doc/doxygen/Doxyfile 2011-11-06 10:38:44 UTC (rev 41577)
@@ -44,7 +44,7 @@
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
-PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png
+PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -193,7 +193,7 @@
# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
-TAB_SIZE = 8
+TAB_SIZE = 4
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
Modified: branches/bmesh/blender/doc/doxygen/doxygen.source
===================================================================
--- branches/bmesh/blender/doc/doxygen/doxygen.source 2011-11-06 09:42:23 UTC (rev 41576)
+++ branches/bmesh/blender/doc/doxygen/doxygen.source 2011-11-06 10:38:44 UTC (rev 41577)
@@ -22,6 +22,10 @@
* \ingroup python
*/
+/** \defgroup pymathutils Python Mathutils
+ * \ingroup python
+ */
+
/** \defgroup pythonintern Python RNA and Operators
* \ingroup python
*/
Copied: branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.1.py (from rev 41572, trunk/blender/doc/python_api/examples/bpy.app.handlers.1.py)
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.1.py (rev 0)
+++ branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.1.py 2011-11-06 10:38:44 UTC (rev 41577)
@@ -0,0 +1,20 @@
+"""
+Persistent Handler Example
+++++++++++++++++++++++++++
+
+By default handlers are freed when loading new files, in some cases you may
+wan't the handler stay running across multiple files (when the handler is
+part of an addon for example).
+
+For this the :data:`bpy.app.handlers.persistent` decorator needs to be used.
+"""
+
+import bpy
+from bpy.app.handlers import persistent
+
+
+ at persistent
+def load_handler(dummy):
+ print("Load Handler:", bpy.data.filepath)
+
+bpy.app.handlers.load_post.append(load_handler)
Copied: branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.py (from rev 41572, trunk/blender/doc/python_api/examples/bpy.app.handlers.py)
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.py (rev 0)
+++ branches/bmesh/blender/doc/python_api/examples/bpy.app.handlers.py 2011-11-06 10:38:44 UTC (rev 41577)
@@ -0,0 +1,12 @@
+"""
+Basic Handler Example
++++++++++++++++++++++
+This script shows the most simple example of adding a handler.
+"""
+
+import bpy
+
+def my_handler(scene):
+ print("Frame Change", scene.frame_current)
+
+bpy.app.handlers.frame_change_pre.append(my_handler)
\ No newline at end of file
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-06 09:42:23 UTC (rev 41576)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-06 10:38:44 UTC (rev 41577)
@@ -50,7 +50,7 @@
# Check we're running in blender
if __import__("sys").modules.get("bpy") is None:
- print("\nError, this script must run from inside blender2.5")
+ print("\nError, this script must run from inside blender")
print(script_help_msg)
import sys
@@ -70,13 +70,14 @@
# for testing so doc-builds dont take so long.
EXCLUDE_MODULES = (
"bpy.context",
- "bpy.app",
+ #"bpy.app",
+ #"bpy.app.handlers",
"bpy.path",
"bpy.data",
"bpy.props",
"bpy.utils",
"bpy.context",
- # "bpy.types", # supports filtering
+ "bpy.types", # supports filtering
"bpy.ops", # supports filtering
"bpy_extras",
"bge",
@@ -109,8 +110,18 @@
("info_gotcha.rst", "Gotcha's: some of the problems you may come up against when writing scripts"),
)
+
+# -----------------------------------------------------------------------------
+# configure compile time options
+
+try:
+ __import__("aud")
+except ImportError:
+ print("Warning: Built without 'aud' module, docs incomplete...")
+ EXCLUDE_MODULES = EXCLUDE_MODULES + ("aud", )
+
+
# import rpdb2; rpdb2.start_embedded_debugger('test')
-
import os
import inspect
import bpy
@@ -120,6 +131,7 @@
ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])
MethodDescriptorType = type(dict.get)
GetSetDescriptorType = type(int.real)
+from types import MemberDescriptorType
EXAMPLE_SET = set()
EXAMPLE_SET_USED = set()
@@ -134,6 +146,10 @@
_BPY_PROP_COLLECTION_ID = "collection"
+def is_struct_seq(value):
+ return isinstance(value, tuple) and type(tuple) != tuple and hasattr(value, "n_fields")
+
+
def undocumented_message(module_name, type_name, identifier):
if str(type_name).startswith('<module'):
preloadtitle = '%s.%s' % (module_name, identifier)
@@ -305,6 +321,10 @@
fw(ident + ".. attribute:: %s\n\n" % identifier)
write_indented_lines(ident + " ", fw, doc, False)
fw("\n")
+ elif type(descr) == MemberDescriptorType: # same as above but use 'data'
+ fw(ident + ".. data:: %s\n\n" % identifier)
+ write_indented_lines(ident + " ", fw, doc, False)
+ fw("\n")
elif type(descr) in (MethodDescriptorType, ClassMethodDescriptorType):
write_indented_lines(ident, fw, doc, False)
fw("\n")
@@ -411,60 +431,91 @@
if key.startswith("__"):
continue
# naughty, we also add getset's into PyStructs, this is not typical py but also not incorrect.
- if type(descr) == types.GetSetDescriptorType: # 'bpy_app_type' name is only used for examples and messages
- py_descr2sphinx("", fw, descr, module_name, "bpy_app_type", key)
+
+ # type_name is only used for examples and messages
+ type_name = str(type(module)).strip("<>").split(" ", 1)[-1][1:-1] # "<class 'bpy.app.handlers'>" --> bpy.app.handlers
+ if type(descr) == types.GetSetDescriptorType:
+ py_descr2sphinx("", fw, descr, module_name, type_name, key)
attribute_set.add(key)
+ descr_sorted = []
for key, descr in sorted(type(module).__dict__.items()):
if key.startswith("__"):
continue
- if type(descr) == types.MemberDescriptorType:
+ if type(descr) == MemberDescriptorType:
if descr.__doc__:
- fw(".. data:: %s\n\n" % key)
- write_indented_lines(" ", fw, descr.__doc__, False)
- fw("\n")
- attribute_set.add(key)
+ value = getattr(module, key, None)
- del key, descr
+ value_type = type(value)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list