[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46373] branches/meshdata_transfer: svn merge ^/trunk/blender -r46300:46330
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Mon May 7 03:04:54 CEST 2012
Revision: 46373
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46373
Author: cyborgmuppet
Date: 2012-05-07 01:04:52 +0000 (Mon, 07 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46300:46330
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46300
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/intern/audaspace/intern/AUD_Reference.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.h
branches/meshdata_transfer/intern/cycles/blender/blender_util.h
branches/meshdata_transfer/intern/cycles/bvh/bvh_build.cpp
branches/meshdata_transfer/intern/cycles/bvh/bvh_build.h
branches/meshdata_transfer/intern/cycles/device/device_cpu.cpp
branches/meshdata_transfer/intern/cycles/kernel/kernel_camera.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_montecarlo.h
branches/meshdata_transfer/intern/cycles/render/image.cpp
branches/meshdata_transfer/intern/cycles/render/image.h
branches/meshdata_transfer/intern/cycles/render/mesh.cpp
branches/meshdata_transfer/intern/cycles/render/mesh.h
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/source/blender/blenkernel/BKE_action.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_armature.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_brush.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_camera.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_font.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_gpencil.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_group.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_image.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_ipo.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_key.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_lamp.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_lattice.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_library.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_material.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_object.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_particle.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_scene.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_screen.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_sound.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_speaker.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_text.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_texture.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_world.h
branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim_sys.c
branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
branches/meshdata_transfer/source/blender/blenkernel/intern/blender.c
branches/meshdata_transfer/source/blender/blenkernel/intern/booleanops_mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/brush.c
branches/meshdata_transfer/source/blender/blenkernel/intern/camera.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
branches/meshdata_transfer/source/blender/blenkernel/intern/dynamicpaint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/editderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/effect.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fcurve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/font.c
branches/meshdata_transfer/source/blender/blenkernel/intern/gpencil.c
branches/meshdata_transfer/source/blender/blenkernel/intern/group.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ipo.c
branches/meshdata_transfer/source/blender/blenkernel/intern/key.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lamp.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
branches/meshdata_transfer/source/blender/blenkernel/intern/library.c
branches/meshdata_transfer/source/blender/blenkernel/intern/material.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
branches/meshdata_transfer/source/blender/blenkernel/intern/node.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ocean.c
branches/meshdata_transfer/source/blender/blenkernel/intern/paint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenkernel/intern/scene.c
branches/meshdata_transfer/source/blender/blenkernel/intern/screen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
branches/meshdata_transfer/source/blender/blenkernel/intern/shrinkwrap.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sound.c
branches/meshdata_transfer/source/blender/blenkernel/intern/speaker.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/texture.c
branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/meshdata_transfer/source/blender/blenkernel/intern/world.c
branches/meshdata_transfer/source/blender/blenlib/BLI_bitmap.h
branches/meshdata_transfer/source/blender/blenlib/BLI_boxpack2d.h
branches/meshdata_transfer/source/blender/blenlib/BLI_bpath.h
branches/meshdata_transfer/source/blender/blenlib/BLI_callbacks.h
branches/meshdata_transfer/source/blender/blenlib/BLI_jitter.h
branches/meshdata_transfer/source/blender/blenlib/BLI_scanfill.h
branches/meshdata_transfer/source/blender/blenlib/BLI_uvproject.h
branches/meshdata_transfer/source/blender/blenlib/BLI_voxel.h
branches/meshdata_transfer/source/blender/blenlib/intern/boxpack2d.c
branches/meshdata_transfer/source/blender/blenlib/intern/bpath.c
branches/meshdata_transfer/source/blender/blenlib/intern/callbacks.c
branches/meshdata_transfer/source/blender/blenlib/intern/freetypefont.c
branches/meshdata_transfer/source/blender/blenlib/intern/jitter.c
branches/meshdata_transfer/source/blender/blenlib/intern/scanfill.c
branches/meshdata_transfer/source/blender/blenlib/intern/uvproject.c
branches/meshdata_transfer/source/blender/blenlib/intern/voxel.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_dupe.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_triangulate.c
branches/meshdata_transfer/source/blender/collada/AnimationExporter.cpp
branches/meshdata_transfer/source/blender/collada/AnimationImporter.cpp
branches/meshdata_transfer/source/blender/collada/ArmatureExporter.cpp
branches/meshdata_transfer/source/blender/collada/ArmatureImporter.cpp
branches/meshdata_transfer/source/blender/collada/DocumentImporter.cpp
branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/meshdata_transfer/source/blender/collada/SkinInfo.cpp
branches/meshdata_transfer/source/blender/collada/SkinInfo.h
branches/meshdata_transfer/source/blender/collada/TransformWriter.cpp
branches/meshdata_transfer/source/blender/collada/collada_utils.cpp
branches/meshdata_transfer/source/blender/editors/animation/anim_deps.c
branches/meshdata_transfer/source/blender/editors/animation/anim_filter.c
branches/meshdata_transfer/source/blender/editors/animation/anim_markers.c
branches/meshdata_transfer/source/blender/editors/animation/keyframing.c
branches/meshdata_transfer/source/blender/editors/animation/keyingsets.c
branches/meshdata_transfer/source/blender/editors/armature/armature_ops.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
branches/meshdata_transfer/source/blender/editors/armature/poseSlide.c
branches/meshdata_transfer/source/blender/editors/armature/poseUtils.c
branches/meshdata_transfer/source/blender/editors/armature/poselib.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.c
branches/meshdata_transfer/source/blender/editors/curve/curve_ops.c
branches/meshdata_transfer/source/blender/editors/curve/editfont.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_edit.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_undo.c
branches/meshdata_transfer/source/blender/editors/include/ED_keyframing.h
branches/meshdata_transfer/source/blender/editors/include/ED_view3d.h
branches/meshdata_transfer/source/blender/editors/interface/interface_ops.c
branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/meshdata_transfer/source/blender/editors/mesh/editface.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_data.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_navmesh.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_ops.c
branches/meshdata_transfer/source/blender/editors/mesh/meshtools.c
branches/meshdata_transfer/source/blender/editors/object/object_add.c
branches/meshdata_transfer/source/blender/editors/object/object_constraint.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_group.c
branches/meshdata_transfer/source/blender/editors/object/object_hook.c
branches/meshdata_transfer/source/blender/editors/object/object_lattice.c
branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/object/object_relations.c
branches/meshdata_transfer/source/blender/editors/object/object_select.c
branches/meshdata_transfer/source/blender/editors/object/object_shapekey.c
branches/meshdata_transfer/source/blender/editors/object/object_transform.c
branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
branches/meshdata_transfer/source/blender/editors/physics/particle_edit.c
branches/meshdata_transfer/source/blender/editors/physics/particle_object.c
branches/meshdata_transfer/source/blender/editors/physics/physics_fluid.c
branches/meshdata_transfer/source/blender/editors/render/render_internal.c
branches/meshdata_transfer/source/blender/editors/render/render_opengl.c
branches/meshdata_transfer/source/blender/editors/render/render_preview.c
branches/meshdata_transfer/source/blender/editors/render/render_shading.c
branches/meshdata_transfer/source/blender/editors/screen/screen_context.c
branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/meshdata_transfer/source/blender/editors/screen/screendump.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_hide.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_ops.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_stroke.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_utils.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/meshdata_transfer/source/blender/editors/sound/sound_ops.c
branches/meshdata_transfer/source/blender/editors/space_action/action_edit.c
branches/meshdata_transfer/source/blender/editors/space_action/action_ops.c
branches/meshdata_transfer/source/blender/editors/space_buttons/buttons_context.c
branches/meshdata_transfer/source/blender/editors/space_buttons/buttons_texture.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_ops.c
branches/meshdata_transfer/source/blender/editors/space_image/image_buttons.c
branches/meshdata_transfer/source/blender/editors/space_image/image_draw.c
branches/meshdata_transfer/source/blender/editors/space_image/image_ops.c
branches/meshdata_transfer/source/blender/editors/space_image/space_image.c
branches/meshdata_transfer/source/blender/editors/space_info/info_ops.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_window.c
branches/meshdata_transfer/source/blender/editors/space_logic/space_logic.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/node_header.c
branches/meshdata_transfer/source/blender/editors/space_node/node_ops.c
branches/meshdata_transfer/source/blender/editors/space_node/node_templates.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_draw.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_edit.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_select.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tools.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/space_sequencer.c
branches/meshdata_transfer/source/blender/editors/space_text/text_ops.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawanimviz.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawarmature.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/editors/space_view3d/space_view3d.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_buttons.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_fly.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_intern.h
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_ops.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_snap.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_view.c
branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/meshdata_transfer/source/blender/editors/transform/transform_generics.c
branches/meshdata_transfer/source/blender/editors/transform/transform_manipulator.c
branches/meshdata_transfer/source/blender/editors/transform/transform_snap.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_draw.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/meshdata_transfer/source/blender/ikplugin/intern/iksolver_plugin.c
branches/meshdata_transfer/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/meshdata_transfer/source/blender/makesdna/DNA_action_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_curve_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_particle_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
branches/meshdata_transfer/source/blender/makesrna/RNA_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_ID.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_animation.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_brush.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_camera.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_camera_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_constraint.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_image.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_image_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_lattice.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_main_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nla.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_text_api.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_array.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_boolean_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_build.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_collision.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_hook.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particlesystem.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_uvproject.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_wave.c
branches/meshdata_transfer/source/blender/nodes/composite/node_composite_tree.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_image.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/meshdata_transfer/source/blender/nodes/intern/node_common.c
branches/meshdata_transfer/source/blender/nodes/shader/node_shader_tree.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/meshdata_transfer/source/blender/python/intern/bpy.c
branches/meshdata_transfer/source/blender/python/intern/bpy_app_handlers.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/render/intern/source/envmap.c
branches/meshdata_transfer/source/blender/render/intern/source/external_engine.c
branches/meshdata_transfer/source/blender/render/intern/source/initrender.c
branches/meshdata_transfer/source/blender/render/intern/source/pipeline.c
branches/meshdata_transfer/source/blender/render/intern/source/pointdensity.c
branches/meshdata_transfer/source/blender/render/intern/source/render_result.c
branches/meshdata_transfer/source/blender/render/intern/source/render_texture.c
branches/meshdata_transfer/source/blender/render/intern/source/rendercore.c
branches/meshdata_transfer/source/blender/render/intern/source/shadbuf.c
branches/meshdata_transfer/source/blender/render/intern/source/volume_precache.c
branches/meshdata_transfer/source/blender/render/intern/source/volumetric.c
branches/meshdata_transfer/source/blender/render/intern/source/voxeldata.c
branches/meshdata_transfer/source/blender/render/intern/source/zbuf.c
branches/meshdata_transfer/source/blender/windowmanager/WM_api.h
branches/meshdata_transfer/source/blender/windowmanager/intern/wm.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_files.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_gesture.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_init_exit.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_window.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/creator.c
branches/meshdata_transfer/source/gameengine/Converter/BL_ActionActuator.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ArmatureObject.h
branches/meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/meshdata_transfer/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/meshdata_transfer/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46330
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-07 01:04:52 UTC (rev 46373)
@@ -1641,6 +1641,7 @@
PATH_SUFFIXES
site-packages
dist-packages
+ NO_DEFAULT_PATH
)
if(NOT EXISTS "${PYTHON_NUMPY_PATH}")
Modified: branches/meshdata_transfer/intern/audaspace/intern/AUD_Reference.h
===================================================================
--- branches/meshdata_transfer/intern/audaspace/intern/AUD_Reference.h 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/audaspace/intern/AUD_Reference.h 2012-05-07 01:04:52 UTC (rev 46373)
@@ -174,8 +174,14 @@
std::cerr << "-" << typeid(*m_reference).name() << std::endl;
#endif
if(AUD_ReferenceHandler::decref(m_original))
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
delete m_reference;
- pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ }
+ else
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ }
}
/**
@@ -194,7 +200,11 @@
std::cerr << "-" << typeid(*m_reference).name() << std::endl;
#endif
if(AUD_ReferenceHandler::decref(m_original))
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
delete m_reference;
+ pthread_mutex_lock(AUD_ReferenceHandler::getMutex());
+ }
m_original = ref.m_original;
m_reference = ref.m_reference;
Modified: branches/meshdata_transfer/intern/audaspace/intern/AUD_SequencerHandle.cpp
===================================================================
--- branches/meshdata_transfer/intern/audaspace/intern/AUD_SequencerHandle.cpp 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/audaspace/intern/AUD_SequencerHandle.cpp 2012-05-07 01:04:52 UTC (rev 46373)
@@ -154,6 +154,7 @@
if(seekpos < 0)
seekpos = 0;
seekpos += m_entry->m_skip;
+ m_handle->setPitch(1.0f);
m_handle->seek(seekpos);
if(position < m_entry->m_begin)
m_handle->pause();
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp 2012-05-07 01:04:52 UTC (rev 46373)
@@ -202,7 +202,7 @@
{
/* test if we can instance or if the object is modified */
BL::ID b_ob_data = b_ob.data();
- BL::ID key = (object_is_modified(b_ob))? b_ob: b_ob_data;
+ BL::ID key = (BKE_object_is_modified(b_ob))? b_ob: b_ob_data;
BL::Material material_override = render_layer.material_override;
/* find shader indices */
@@ -309,7 +309,7 @@
/* skip objects without deforming modifiers. this is not a totally reliable,
* would need a more extensive check to see which objects are animated */
- if(!size || !ccl::object_is_deform_modified(b_ob, b_scene, preview))
+ if(!size || !ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview))
return;
/* get derived mesh */
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-07 01:04:52 UTC (rev 46373)
@@ -34,10 +34,10 @@
/* Utilities */
-bool BlenderSync::object_is_modified(BL::Object b_ob)
+bool BlenderSync::BKE_object_is_modified(BL::Object b_ob)
{
/* test if we can instance or if the object is modified */
- if(ccl::object_is_modified(b_ob, b_scene, preview)) {
+ if(ccl::BKE_object_is_modified(b_ob, b_scene, preview)) {
/* modifiers */
return true;
}
@@ -286,7 +286,7 @@
BL::Scene::objects_iterator b_ob;
for(b_scene.objects.begin(b_ob); b_ob != b_scene.objects.end(); ++b_ob) {
- bool hide = (b_v3d)? b_ob->hide(): b_ob->hide_render();
+ bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
uint ob_layer = get_layer(b_ob->layers());
if(!hide && (ob_layer & scene_layer)) {
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp 2012-05-07 01:04:52 UTC (rev 46373)
@@ -87,7 +87,7 @@
if(object_is_mesh(*b_ob)) {
if(b_ob->is_updated_data() || b_ob->data().is_updated()) {
- BL::ID key = object_is_modified(*b_ob)? *b_ob: b_ob->data();
+ BL::ID key = BKE_object_is_modified(*b_ob)? *b_ob: b_ob->data();
mesh_map.set_recalc(key);
}
}
@@ -215,6 +215,7 @@
render_layer.holdout_layer = 0;
render_layer.material_override = PointerRNA_NULL;
render_layer.use_background = true;
+ render_layer.use_viewport_visibility = true;
render_layer.samples = 0;
return;
}
@@ -234,6 +235,7 @@
render_layer.layer |= render_layer.holdout_layer;
render_layer.material_override = b_rlay->material_override();
render_layer.use_background = b_rlay->use_sky();
+ render_layer.use_viewport_visibility = false;
render_layer.samples = b_rlay->samples();
}
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_sync.h 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_sync.h 2012-05-07 01:04:52 UTC (rev 46373)
@@ -88,7 +88,7 @@
/* util */
void find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader);
- bool object_is_modified(BL::Object b_ob);
+ bool BKE_object_is_modified(BL::Object b_ob);
bool object_is_mesh(BL::Object b_ob);
bool object_is_light(BL::Object b_ob);
@@ -113,6 +113,7 @@
: scene_layer(0), layer(0), holdout_layer(0),
material_override(PointerRNA_NULL),
use_background(true),
+ use_viewport_visibility(false),
samples(0)
{}
@@ -122,6 +123,7 @@
uint holdout_layer;
BL::Material material_override;
bool use_background;
+ bool use_viewport_visibility;
int samples;
} render_layer;
};
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_util.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_util.h 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_util.h 2012-05-07 01:04:52 UTC (rev 46373)
@@ -91,12 +91,12 @@
rna_Object_free_duplilist(self.ptr.data, NULL);
}
-static inline bool object_is_modified(BL::Object self, BL::Scene scene, bool preview)
+static inline bool BKE_object_is_modified(BL::Object self, BL::Scene scene, bool preview)
{
return rna_Object_is_modified(self.ptr.data, scene.ptr.data, (preview)? (1<<0): (1<<1))? true: false;
}
-static inline bool object_is_deform_modified(BL::Object self, BL::Scene scene, bool preview)
+static inline bool BKE_object_is_deform_modified(BL::Object self, BL::Scene scene, bool preview)
{
return rna_Object_is_deform_modified(self.ptr.data, scene.ptr.data, (preview)? (1<<0): (1<<1))? true: false;
}
Modified: branches/meshdata_transfer/intern/cycles/bvh/bvh_build.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/bvh/bvh_build.cpp 2012-05-06 23:32:40 UTC (rev 46372)
+++ branches/meshdata_transfer/intern/cycles/bvh/bvh_build.cpp 2012-05-07 01:04:52 UTC (rev 46373)
@@ -36,12 +36,12 @@
class BVHBuildTask : public Task {
public:
- BVHBuildTask(InnerNode *node_, int child_, BVHObjectBinning& range_, int level_)
- : node(node_), child(child_), level(level_), range(range_) {}
+ BVHBuildTask(BVHBuild *build, InnerNode *node, int child, BVHObjectBinning& range_, int level)
+ : range(range_)
+ {
+ run = function_bind(&BVHBuild::thread_build_node, build, node, child, &range, level);
+ }
- InnerNode *node;
- int child;
- int level;
BVHObjectBinning range;
};
@@ -55,8 +55,7 @@
prim_object(prim_object_),
params(params_),
progress(progress_),
- progress_start_time(0.0),
- task_pool(function_bind(&BVHBuild::thread_build_node, this, _1, _2))
+ progress_start_time(0.0)
{
spatial_min_overlap = 0.0f;
}
@@ -177,7 +176,7 @@
/* multithreaded binning build */
BVHObjectBinning rootbin(root, (references.size())? &references[0]: NULL);
rootnode = build_node(rootbin, 0);
- task_pool.wait();
+ task_pool.wait_work();
}
/* delete if we cancelled */
@@ -210,25 +209,24 @@
progress_start_time = time_dt();
}
-void BVHBuild::thread_build_node(Task *task_, int thread_id)
+void BVHBuild::thread_build_node(InnerNode *inner, int child, BVHObjectBinning *range, int level)
{
if(progress.get_cancel())
return;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list