[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46371] branches/meshdata_transfer: svn merge ^/trunk/blender -r46100:46200
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Mon May 7 01:06:25 CEST 2012
Revision: 46371
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46371
Author: cyborgmuppet
Date: 2012-05-06 23:06:24 +0000 (Sun, 06 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46100:46200
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46100
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/GNUmakefile
branches/meshdata_transfer/SConstruct
branches/meshdata_transfer/build_files/cmake/cmake_consistency_check.py
branches/meshdata_transfer/build_files/cmake/cmake_netbeans_project.py
branches/meshdata_transfer/build_files/cmake/cmake_qtcreator_project.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_cppcheck.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_sparse.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_splint.py
branches/meshdata_transfer/build_files/cmake/example_scripts/make_quicky.py
branches/meshdata_transfer/build_files/cmake/project_info.py
branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py
branches/meshdata_transfer/build_files/scons/config/win64-vc-config.py
branches/meshdata_transfer/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/meshdata_transfer/doc/blender_file_format/BlendFileReader.py
branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py
branches/meshdata_transfer/doc/python_api/rst/bgl.rst
branches/meshdata_transfer/intern/cycles/app/cycles_xml.cpp
branches/meshdata_transfer/intern/cycles/blender/addon/__init__.py
branches/meshdata_transfer/intern/cycles/blender/addon/ui.py
branches/meshdata_transfer/intern/cycles/blender/blender_camera.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_session.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/kernel/kernel_bvh.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_camera.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_compat_opencl.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_emission.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_light.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_passes.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_path.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_textures.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_triangle.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_gamma.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
branches/meshdata_transfer/intern/cycles/render/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/render/attribute.cpp
branches/meshdata_transfer/intern/cycles/render/attribute.h
branches/meshdata_transfer/intern/cycles/render/buffers.cpp
branches/meshdata_transfer/intern/cycles/render/camera.cpp
branches/meshdata_transfer/intern/cycles/render/camera.h
branches/meshdata_transfer/intern/cycles/render/film.cpp
branches/meshdata_transfer/intern/cycles/render/film.h
branches/meshdata_transfer/intern/cycles/render/graph.cpp
branches/meshdata_transfer/intern/cycles/render/integrator.cpp
branches/meshdata_transfer/intern/cycles/render/integrator.h
branches/meshdata_transfer/intern/cycles/render/mesh.cpp
branches/meshdata_transfer/intern/cycles/render/mesh.h
branches/meshdata_transfer/intern/cycles/render/mesh_displace.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.cpp
branches/meshdata_transfer/intern/cycles/render/object.cpp
branches/meshdata_transfer/intern/cycles/render/object.h
branches/meshdata_transfer/intern/cycles/render/scene.cpp
branches/meshdata_transfer/intern/cycles/render/scene.h
branches/meshdata_transfer/intern/cycles/render/shader.cpp
branches/meshdata_transfer/intern/cycles/render/shader.h
branches/meshdata_transfer/intern/cycles/render/svm.cpp
branches/meshdata_transfer/intern/cycles/render/svm.h
branches/meshdata_transfer/intern/cycles/subd/subd_dice.cpp
branches/meshdata_transfer/intern/cycles/util/util_boundbox.h
branches/meshdata_transfer/intern/cycles/util/util_math.h
branches/meshdata_transfer/intern/cycles/util/util_transform.cpp
branches/meshdata_transfer/intern/cycles/util/util_transform.h
branches/meshdata_transfer/intern/smoke/intern/smoke_API.cpp
branches/meshdata_transfer/intern/tools/bpy_introspect_ui.py
branches/meshdata_transfer/intern/tools/credits_svn_gen.py
branches/meshdata_transfer/intern/tools/dump_rna2xml.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_game.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_object.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_clip.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_info.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/source/blender/avi/AVI_avi.h
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/avi/intern/avirgb.c
branches/meshdata_transfer/source/blender/avi/intern/codecs.c
branches/meshdata_transfer/source/blender/avi/intern/endian.c
branches/meshdata_transfer/source/blender/avi/intern/endian.h
branches/meshdata_transfer/source/blender/avi/intern/mjpeg.c
branches/meshdata_transfer/source/blender/avi/intern/options.c
branches/meshdata_transfer/source/blender/avi/intern/rgb32.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_brush.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_customdata.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_deform.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_dynamicpaint.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_object.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_ocean.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_tracking.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_utildefines.h
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.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/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/context.c
branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.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/group.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ipo.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lamp.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.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/softbody.c
branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeffmpeg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeframeserver.c
branches/meshdata_transfer/source/blender/blenlib/BLI_fileops.h
branches/meshdata_transfer/source/blender/blenlib/BLI_ghash.h
branches/meshdata_transfer/source/blender/blenlib/BLI_math_matrix.h
branches/meshdata_transfer/source/blender/blenlib/BLI_memarena.h
branches/meshdata_transfer/source/blender/blenlib/BLI_threads.h
branches/meshdata_transfer/source/blender/blenlib/PIL_time.h
branches/meshdata_transfer/source/blender/blenlib/intern/BLI_args.c
branches/meshdata_transfer/source/blender/blenlib/intern/bpath.c
branches/meshdata_transfer/source/blender/blenlib/intern/cpu.c
branches/meshdata_transfer/source/blender/blenlib/intern/jitter.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_matrix.c
branches/meshdata_transfer/source/blender/blenlib/intern/noise.c
branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
branches/meshdata_transfer/source/blender/blenlib/intern/storage.c
branches/meshdata_transfer/source/blender/blenlib/intern/string_cursor_utf8.c
branches/meshdata_transfer/source/blender/blenlib/intern/threads.c
branches/meshdata_transfer/source/blender/blenlib/intern/winstuff.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/blenpluginapi/documentation.h
branches/meshdata_transfer/source/blender/blenpluginapi/externdef.h
branches/meshdata_transfer/source/blender/blenpluginapi/floatpatch.h
branches/meshdata_transfer/source/blender/blenpluginapi/iff.h
branches/meshdata_transfer/source/blender/blenpluginapi/plugin.h
branches/meshdata_transfer/source/blender/blenpluginapi/util.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_interp.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_interp.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_private.h
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_primitive.c
branches/meshdata_transfer/source/blender/collada/AnimationImporter.cpp
branches/meshdata_transfer/source/blender/collada/AnimationImporter.h
branches/meshdata_transfer/source/blender/collada/DocumentImporter.cpp
branches/meshdata_transfer/source/blender/collada/DocumentImporter.h
branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/meshdata_transfer/source/blender/collada/MeshImporter.h
branches/meshdata_transfer/source/blender/editors/animation/keyframing.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature_retarget.c
branches/meshdata_transfer/source/blender/editors/armature/poseUtils.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.c
branches/meshdata_transfer/source/blender/editors/curve/editcurve.c
branches/meshdata_transfer/source/blender/editors/datafiles/Bfont.c
branches/meshdata_transfer/source/blender/editors/datafiles/startup.blend.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_paint.c
branches/meshdata_transfer/source/blender/editors/include/ED_clip.h
branches/meshdata_transfer/source/blender/editors/include/ED_fluidsim.h
branches/meshdata_transfer/source/blender/editors/include/ED_particle.h
branches/meshdata_transfer/source/blender/editors/include/ED_physics.h
branches/meshdata_transfer/source/blender/editors/include/UI_resources.h
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
branches/meshdata_transfer/source/blender/editors/interface/interface_layout.c
branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/meshdata_transfer/source/blender/editors/interface/interface_utils.c
branches/meshdata_transfer/source/blender/editors/interface/resources.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.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/meshtools.c
branches/meshdata_transfer/source/blender/editors/object/object_add.c
branches/meshdata_transfer/source/blender/editors/object/object_bake.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_modifier.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_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/physics_fluid.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/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_stroke.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_undo.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/meshdata_transfer/source/blender/editors/sound/sound_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/space_clip/SConscript
branches/meshdata_transfer/source/blender/editors/space_clip/clip_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_intern.h
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/space_clip.c
branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
branches/meshdata_transfer/source/blender/editors/space_info/info_stats.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_buttons.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_node/node_buttons.c
branches/meshdata_transfer/source/blender/editors/space_node/node_draw.c
branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/node_intern.h
branches/meshdata_transfer/source/blender/editors/space_node/node_ops.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_add.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_select.c
branches/meshdata_transfer/source/blender/editors/space_time/space_time.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawanimviz.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/view3d_intern.h
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/transform/transform.c
branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/meshdata_transfer/source/blender/editors/transform/transform_ops.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_parametrizer.h
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/meshdata_transfer/source/blender/gpu/CMakeLists.txt
branches/meshdata_transfer/source/blender/gpu/GPU_extensions.h
branches/meshdata_transfer/source/blender/gpu/GPU_material.h
branches/meshdata_transfer/source/blender/gpu/SConscript
branches/meshdata_transfer/source/blender/gpu/intern/gpu_codegen.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_extensions.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/meshdata_transfer/source/blender/imbuf/IMB_imbuf_types.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_allocimbuf.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_anim.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_filter.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineonfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineonlib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineonlib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxlib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxlib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageCore.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageCore.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageLib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageLib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logmemfile.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logmemfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/dds/ColorBlock.h
branches/meshdata_transfer/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/meshdata_transfer/source/blender/imbuf/intern/filter.c
branches/meshdata_transfer/source/blender/imbuf/intern/imageprocess.c
branches/meshdata_transfer/source/blender/imbuf/intern/imbuf.h
branches/meshdata_transfer/source/blender/imbuf/intern/imbuf_cocoa.m
branches/meshdata_transfer/source/blender/imbuf/intern/indexer.c
branches/meshdata_transfer/source/blender/imbuf/intern/tiff.c
branches/meshdata_transfer/source/blender/imbuf/intern/util.c
branches/meshdata_transfer/source/blender/makesdna/DNA_boid_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_group_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_lamp_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_fluidsim.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_force.h
branches/meshdata_transfer/source/blender/makesdna/DNA_property_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_space_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_tracking_types.h
branches/meshdata_transfer/source/blender/makesdna/intern/dna_genfile.c
branches/meshdata_transfer/source/blender/makesrna/RNA_access.h
branches/meshdata_transfer/source/blender/makesrna/RNA_enum_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_access.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_animviz.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_image_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_lamp.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_material_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose_api.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_screen.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_test.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
branches/meshdata_transfer/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/meshdata_transfer/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_meshdeform.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mirror.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particlesystem.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_distanceMatte.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_sepcombHSVA.c
branches/meshdata_transfer/source/blender/nodes/intern/node_common.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types.h
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Color.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Color.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Matrix.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Quaternion.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Vector.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.h
branches/meshdata_transfer/source/blender/quicktime/apple/quicktime_export.c
branches/meshdata_transfer/source/blender/quicktime/apple/quicktime_import.c
branches/meshdata_transfer/source/blender/render/intern/include/gammaCorrectionTables.h
branches/meshdata_transfer/source/blender/render/intern/include/initrender.h
branches/meshdata_transfer/source/blender/render/intern/include/occlusion.h
branches/meshdata_transfer/source/blender/render/intern/include/rendercore.h
branches/meshdata_transfer/source/blender/render/intern/include/shadbuf.h
branches/meshdata_transfer/source/blender/render/intern/include/texture.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_internal.h
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/gammaCorrectionTables.c
branches/meshdata_transfer/source/blender/render/intern/source/imagetexture.c
branches/meshdata_transfer/source/blender/render/intern/source/occlusion.c
branches/meshdata_transfer/source/blender/render/intern/source/pipeline.c
branches/meshdata_transfer/source/blender/render/intern/source/pixelblending.c
branches/meshdata_transfer/source/blender/render/intern/source/render_result.c
branches/meshdata_transfer/source/blender/render/intern/source/sss.c
branches/meshdata_transfer/source/blender/render/intern/source/sunsky.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_keymap.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/CMakeLists.txt
branches/meshdata_transfer/source/creator/creator.c
branches/meshdata_transfer/source/gameengine/Converter/KX_ConvertProperties.h
branches/meshdata_transfer/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Light.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Light.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_PythonSeq.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/meshdata_transfer/source/gameengine/VideoTexture/Texture.cpp
branches/meshdata_transfer/source/tools/tag_release.py
branches/meshdata_transfer/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/meshdata_transfer/source/blender/gpu/shaders/
Removed Paths:
-------------
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
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/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-46100
+ /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
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-06 22:36:51 UTC (rev 46370)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-06 23:06:24 UTC (rev 46371)
@@ -228,6 +228,10 @@
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
+set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
+mark_as_advanced(PYTHON_NUMPY_PATH)
+
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
mark_as_advanced(WITH_MINGW64)
@@ -303,7 +307,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
@@ -1612,6 +1616,49 @@
"to a valid python include path. Containing "
"Python.h for python version \"${PYTHON_VERSION}\"")
endif()
+
+ if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
+ # set but invalid
+ if(NOT ${PYTHON_NUMPY_PATH} STREQUAL "")
+ if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
+ message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
+ "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+ set(WITH_PYTHON_INSTALL_NUMPY OFF)
+ endif()
+ # not set, so initialize
+ else()
+ string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
+ list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
+
+ # re-cache
+ unset(PYTHON_NUMPY_PATH CACHE)
+ find_path(PYTHON_NUMPY_PATH
+ NAMES
+ numpy
+ HINTS
+ "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
+ "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
+ PATH_SUFFIXES
+ site-packages
+ dist-packages
+ )
+
+ if(NOT EXISTS "${PYTHON_NUMPY_PATH}")
+ message(WARNING "'numpy' path could not be found in:\n"
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy', "
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/numpy', "
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/numpy', "
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/numpy', "
+ "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+ set(WITH_PYTHON_INSTALL_NUMPY OFF)
+ else()
+ message(STATUS "numpy found at '${PYTHON_NUMPY_PATH}'")
+ endif()
+
+ unset(_PY_VER_SPLIT)
+ unset(_PY_VER_MAJOR)
+ endif()
+ endif()
endif()
@@ -1668,7 +1715,7 @@
_setting)
set(_msg " * ${_setting}")
string(LENGTH "${_msg}" _len)
- while("28" GREATER "${_len}")
+ while("32" GREATER "${_len}")
set(_msg "${_msg} ")
math(EXPR _len "${_len} + 1")
endwhile()
@@ -1728,6 +1775,7 @@
info_cfg_text("Python:")
info_cfg_option(WITH_PYTHON_INSTALL)
+ info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
info_cfg_option(WITH_PYTHON_MODULE)
info_cfg_option(WITH_PYTHON_SAFETY)
Modified: branches/meshdata_transfer/GNUmakefile
===================================================================
--- branches/meshdata_transfer/GNUmakefile 2012-05-06 22:36:51 UTC (rev 46370)
+++ branches/meshdata_transfer/GNUmakefile 2012-05-06 23:06:24 UTC (rev 46371)
@@ -164,6 +164,7 @@
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+ @echo " * test_style - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
@echo ""
@echo "Static Source Code Checking (not assosiated with building blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@@ -201,28 +202,31 @@
# run pep8 check check on scripts we distribute.
test_pep8:
- python3 source/tests/pep8.py > test_pep8.log 2>&1
+ python3.2 source/tests/pep8.py > test_pep8.log 2>&1
@echo "written: test_pep8.log"
# run some checks on our cmakefiles.
test_cmake:
- python3 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+ python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
@echo "written: test_cmake_consistency.log"
# run deprecation tests, see if we have anything to remove.
test_deprecated:
- python3 source/tests/check_deprecated.py
+ python3.2 source/tests/check_deprecated.py
+test_style:
+ # run our own checks on C/C++ style
+ PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator
# -----------------------------------------------------------------------------
# Project Files
#
project_qtcreator:
- python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+ python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
project_netbeans:
- python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+ python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
project_eclipse:
cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
@@ -234,23 +238,22 @@
check_cppcheck:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+ cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
check_splint:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+ cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
check_sparse:
$(CMAKE_CONFIG)
- cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+ cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
check_spelling_py:
- cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
check_spelling_c:
- cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
-
# -----------------------------------------------------------------------------
# Documentation
#
@@ -270,7 +273,7 @@
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
doc_man:
- python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+ python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
clean:
Modified: branches/meshdata_transfer/SConstruct
===================================================================
--- branches/meshdata_transfer/SConstruct 2012-05-06 22:36:51 UTC (rev 46370)
+++ branches/meshdata_transfer/SConstruct 2012-05-06 23:06:24 UTC (rev 46371)
@@ -805,6 +805,7 @@
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
+ dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll')
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/meshdata_transfer/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/meshdata_transfer/build_files/cmake/cmake_consistency_check.py 2012-05-06 22:36:51 UTC (rev 46370)
+++ branches/meshdata_transfer/build_files/cmake/cmake_consistency_check.py 2012-05-06 23:06:24 UTC (rev 46371)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/meshdata_transfer/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/meshdata_transfer/build_files/cmake/cmake_netbeans_project.py 2012-05-06 22:36:51 UTC (rev 46370)
+++ branches/meshdata_transfer/build_files/cmake/cmake_netbeans_project.py 2012-05-06 23:06:24 UTC (rev 46371)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/meshdata_transfer/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/meshdata_transfer/build_files/cmake/cmake_qtcreator_project.py 2012-05-06 22:36:51 UTC (rev 46370)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list