[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29926] branches/soc-2010-jwilkins: Merged with trunk: 29341-29923
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sun Jul 4 13:41:42 CEST 2010
Revision: 29926
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29926
Author: jwilkins
Date: 2010-07-04 13:41:42 +0200 (Sun, 04 Jul 2010)
Log Message:
-----------
Merged with trunk: 29341-29923
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/config/linuxcross-config.py
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-jwilkins/release/scripts/io/engine_render_pov.py
branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py
branches/soc-2010-jwilkins/release/scripts/io/export_mdd.py
branches/soc-2010-jwilkins/release/scripts/io/export_obj.py
branches/soc-2010-jwilkins/release/scripts/io/export_ply.py
branches/soc-2010-jwilkins/release/scripts/io/export_x3d.py
branches/soc-2010-jwilkins/release/scripts/io/import_anim_bvh.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_obj.py
branches/soc-2010-jwilkins/release/scripts/io/import_shape_mdd.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/master.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/operators.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/repath.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/add_object_utils.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
branches/soc-2010-jwilkins/release/scripts/modules/graphviz_export.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_info.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-jwilkins/release/scripts/op/console_python.py
branches/soc-2010-jwilkins/release/scripts/op/image.py
branches/soc-2010-jwilkins/release/scripts/op/object.py
branches/soc-2010-jwilkins/release/scripts/op/presets.py
branches/soc-2010-jwilkins/release/scripts/op/sequencer.py
branches/soc-2010-jwilkins/release/scripts/op/uv.py
branches/soc-2010-jwilkins/release/scripts/op/wm.py
branches/soc-2010-jwilkins/release/scripts/presets/interaction/maya.py
branches/soc-2010-jwilkins/release/scripts/templates/operator.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_curve.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_game.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_render.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_scene.py
branches/soc-2010-jwilkins/release/scripts/ui/space_info.py
branches/soc-2010-jwilkins/release/scripts/ui/space_logic.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_text.py
branches/soc-2010-jwilkins/release/scripts/ui/space_time.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/Makefile
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_idprop.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_key.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_softbody.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/blender.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/effect.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idprop.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/key.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/multires.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/report.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_linklist.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_base.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_inline.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_pbvh.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_rect.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_uvproject.h
branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/noise.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/rct.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/threads.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/uvproject.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-jwilkins/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframing.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyingsets.c
branches/soc-2010-jwilkins/source/blender/editors/armature/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/armature/Makefile
branches/soc-2010-jwilkins/source/blender/editors/armature/SConscript
branches/soc-2010-jwilkins/source/blender/editors/armature/armature_intern.h
branches/soc-2010-jwilkins/source/blender/editors/armature/armature_ops.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-jwilkins/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c
branches/soc-2010-jwilkins/source/blender/editors/curve/curve_intern.h
branches/soc-2010-jwilkins/source/blender/editors/curve/curve_ops.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_object.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_screen_types.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_anim.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_panel.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_intern.h
branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_ops.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_object.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-jwilkins/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/space_action.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_panels.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/space_image.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/space_text.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ops.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/anim.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/targa.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_camera_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_screen_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_screen.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sound.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2010-jwilkins/source/blender/python/doc/examples/mathutils.py
branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
branches/soc-2010-jwilkins/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rayobject_instance.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_types.h
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2010-jwilkins/source/gameengine/VideoTexture/blendVideoTex.cpp
Property Changed:
----------------
branches/soc-2010-jwilkins/doc/blender.1
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-04 11:41:42 UTC (rev 29926)
@@ -45,7 +45,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
# quiet output for Makefiles, 'make -s' helps too
-SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
PROJECT(Blender)
Modified: branches/soc-2010-jwilkins/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-jwilkins/config/linuxcross-config.py 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/config/linuxcross-config.py 2010-07-04 11:41:42 UTC (rev 29926)
@@ -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'
Property changes on: branches/soc-2010-jwilkins/doc/blender.1
___________________________________________________________________
Name: svn:mime-type
+ application/x-troff-man
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-07-04 11:41:42 UTC (rev 29926)
@@ -271,6 +271,8 @@
GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
+ if (!GetActiveWindow())
+ return GHOST_kFailure;
return ::SetCursorPos(x, y) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
}
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-04 11:41:42 UTC (rev 29926)
@@ -465,7 +465,7 @@
/* could also clamp to screen bounds
* wrap with a window outside the view will fail atm */
- bounds.wrapPoint(x_new, y_new, 2); /* offset of one incase blender is at screen bounds */
+ bounds.wrapPoint(x_new, y_new, 8); /* offset of one incase blender is at screen bounds */
window->getCursorGrabAccum(x_accum, y_accum);
if(x_new != xme.x_root || y_new != xme.y_root) {
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp 2010-07-04 11:41:42 UTC (rev 29926)
@@ -57,6 +57,9 @@
#define MWM_HINTS_DECORATIONS (1L << 1)
+
+// #define GHOST_X11_GRAB
+
/*
* A Client can't change the window property, that is
* the work of the window manager. In case, we send
@@ -1443,7 +1446,9 @@
setWindowCursorVisibility(false);
}
+#ifdef GHOST_X11_GRAB
XGrabPointer(m_display, m_window, False, ButtonPressMask| ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+#endif
}
else {
if (m_cursorGrab==GHOST_kGrabHide) {
@@ -1461,7 +1466,9 @@
/* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */
setCursorGrabAccum(0, 0);
m_cursorGrabBounds.m_l= m_cursorGrabBounds.m_r= -1; /* disable */
+#ifdef GHOST_X11_GRAB
XUngrabPointer(m_display, CurrentTime);
+#endif
}
XFlush(m_display);
Modified: branches/soc-2010-jwilkins/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/io/engine_render_pov.py 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/release/scripts/io/engine_render_pov.py 2010-07-04 11:41:42 UTC (rev 29926)
@@ -762,12 +762,22 @@
if 1:
# TODO, when povray isnt found this gives a cryptic error, would be nice to be able to detect if it exists
- self._process = subprocess.Popen([pov_binary, self._temp_file_ini]) # stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ try:
+ self._process = subprocess.Popen([pov_binary, self._temp_file_ini]) # stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ except OSError:
+ # TODO, report api
+ print("POVRAY: could not execute '%s', possibly povray isn't installed" % pov_binary)
+ import traceback
+ traceback.print_exc()
+ print ("***-DONE-***")
+ return False
+
else:
# This works too but means we have to wait until its done
os.system('%s %s' % (pov_binary, self._temp_file_ini))
print ("***-DONE-***")
+ return True
def _cleanup(self):
for f in (self._temp_file_in, self._temp_file_ini, self._temp_file_out):
@@ -783,8 +793,11 @@
self.update_stats("", "POVRAY: Exporting data from Blender")
self._export(scene)
self.update_stats("", "POVRAY: Parsing File")
- self._render()
+ if not self._render():
+ self.update_stats("", "POVRAY: Not found")
+ return
+
r = scene.render
# compute resolution
Modified: branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py 2010-07-04 11:41:42 UTC (rev 29926)
@@ -1123,11 +1123,11 @@
# filename = StringProperty(name="File Name", description="File name used for exporting the 3DS file", maxlen= 1024, default= ""),
- path = StringProperty(name="File Path", description="File path 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'})
def execute(self, context):
- save_3ds(self.properties.path, context)
+ save_3ds(self.properties.filepath, context)
return {'FINISHED'}
def invoke(self, context, event):
@@ -1142,7 +1142,7 @@
# Add to a menu
def menu_func(self, context):
default_path = bpy.data.filepath.replace(".blend", ".3ds")
- self.layout.operator(Export3DS.bl_idname, text="3D Studio (.3ds)").path = default_path
+ self.layout.operator(Export3DS.bl_idname, text="3D Studio (.3ds)").filepath = default_path
def register():
Modified: branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py 2010-07-04 11:38:42 UTC (rev 29925)
+++ branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py 2010-07-04 11:41:42 UTC (rev 29926)
@@ -2011,9 +2011,8 @@
if ob_arms_orig_rest:
for ob_base in bpy.data.objects:
- #if ob_base.type == 'Armature':
- ob_base.make_display_list(scene)
-# ob_base.makeDisplayList()
+ if ob_base.type == 'ARMATURE':
+ ob_base.update(scene)
# This causes the makeDisplayList command to effect the mesh
scene.set_frame(scene.frame_current)
@@ -2187,9 +2186,7 @@
if ob_arms_orig_rest:
for ob_base in bpy.data.objects:
if ob_base.type == 'ARMATURE':
-# if ob_base.type == 'Armature':
- ob_base.make_display_list(scene)
-# ob_base.makeDisplayList()
+ ob_base.update(scene)
# This causes the makeDisplayList command to effect the mesh
scene.set_frame(scene.frame_current)
# Blender.Set('curframe', Blender.Get('curframe'))
@@ -3338,7 +3335,7 @@
# to the class instance from the operator settings before calling.
- path = StringProperty(name="File Path", description="File path used for exporting the FBX file", maxlen= 1024, default="")
+ filepath = StringProperty(name="File Path", description="Filepath used for exporting the FBX file", maxlen= 1024, default="")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
EXP_OBS_SELECTED = BoolProperty(name="Selected Objects", description="Export selected objects on visible layers", default=True)
@@ -3372,8 +3369,8 @@
return context.active_object
def execute(self, context):
- if not self.properties.path:
- raise Exception("path not set")
+ if not self.properties.filepath:
+ raise Exception("filepath not set")
GLOBAL_MATRIX = mtx4_identity
GLOBAL_MATRIX[0][0] = GLOBAL_MATRIX[1][1] = GLOBAL_MATRIX[2][2] = self.properties.TX_SCALE
@@ -3381,7 +3378,7 @@
if self.properties.TX_YROT90: GLOBAL_MATRIX = mtx4_y90n * GLOBAL_MATRIX
if self.properties.TX_ZROT90: GLOBAL_MATRIX = mtx4_z90n * GLOBAL_MATRIX
- write(self.properties.path,
+ write(self.properties.filepath,
None, # XXX
context,
self.properties.EXP_OBS_SELECTED,
@@ -3414,7 +3411,7 @@
# if __name__ == "__main__":
-# bpy.ops.EXPORT_OT_ply(path="/tmp/test.ply")
+# bpy.ops.EXPORT_OT_ply(filepath="/tmp/test.ply")
# NOTES (all line numbers correspond to original export_fbx.py (under release/scripts)
@@ -3442,7 +3439,7 @@
def menu_func(self, context):
default_path = bpy.data.filepath.replace(".blend", ".fbx")
- self.layout.operator(ExportFBX.bl_idname, text="Autodesk FBX (.fbx)").path = default_path
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list