[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46324] branches/smoke2: Merge from trunk r46114-r46322
Daniel Genrich
daniel.genrich at gmx.net
Sat May 5 21:15:35 CEST 2012
Revision: 46324
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46324
Author: genscher
Date: 2012-05-05 19:15:33 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Merge from trunk r46114-r46322
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46114
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46322
Modified Paths:
--------------
branches/smoke2/CMakeLists.txt
branches/smoke2/GNUmakefile
branches/smoke2/SConstruct
branches/smoke2/build_files/cmake/cmake_consistency_check.py
branches/smoke2/build_files/cmake/cmake_netbeans_project.py
branches/smoke2/build_files/cmake/cmake_qtcreator_project.py
branches/smoke2/build_files/cmake/cmake_static_check_cppcheck.py
branches/smoke2/build_files/cmake/cmake_static_check_sparse.py
branches/smoke2/build_files/cmake/cmake_static_check_splint.py
branches/smoke2/build_files/cmake/example_scripts/make_quicky.py
branches/smoke2/build_files/cmake/project_info.py
branches/smoke2/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/smoke2/doc/blender_file_format/BlendFileReader.py
branches/smoke2/doc/python_api/examples/bpy.types.Mesh.py
branches/smoke2/doc/python_api/rst/bgl.rst
branches/smoke2/intern/audaspace/intern/AUD_Reference.h
branches/smoke2/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/smoke2/intern/cycles/app/cycles_xml.cpp
branches/smoke2/intern/cycles/blender/addon/__init__.py
branches/smoke2/intern/cycles/blender/addon/enums.py
branches/smoke2/intern/cycles/blender/addon/properties.py
branches/smoke2/intern/cycles/blender/addon/ui.py
branches/smoke2/intern/cycles/blender/blender_camera.cpp
branches/smoke2/intern/cycles/blender/blender_mesh.cpp
branches/smoke2/intern/cycles/blender/blender_object.cpp
branches/smoke2/intern/cycles/blender/blender_session.cpp
branches/smoke2/intern/cycles/blender/blender_sync.cpp
branches/smoke2/intern/cycles/blender/blender_sync.h
branches/smoke2/intern/cycles/blender/blender_util.h
branches/smoke2/intern/cycles/bvh/bvh_binning.cpp
branches/smoke2/intern/cycles/bvh/bvh_build.cpp
branches/smoke2/intern/cycles/device/device_cuda.cpp
branches/smoke2/intern/cycles/kernel/kernel_bvh.h
branches/smoke2/intern/cycles/kernel/kernel_camera.h
branches/smoke2/intern/cycles/kernel/kernel_emission.h
branches/smoke2/intern/cycles/kernel/kernel_light.h
branches/smoke2/intern/cycles/kernel/kernel_montecarlo.h
branches/smoke2/intern/cycles/kernel/kernel_object.h
branches/smoke2/intern/cycles/kernel/kernel_passes.h
branches/smoke2/intern/cycles/kernel/kernel_path.h
branches/smoke2/intern/cycles/kernel/kernel_shader.h
branches/smoke2/intern/cycles/kernel/kernel_textures.h
branches/smoke2/intern/cycles/kernel/kernel_triangle.h
branches/smoke2/intern/cycles/kernel/kernel_types.h
branches/smoke2/intern/cycles/kernel/svm/svm_light_path.h
branches/smoke2/intern/cycles/kernel/svm/svm_tex_coord.h
branches/smoke2/intern/cycles/kernel/svm/svm_types.h
branches/smoke2/intern/cycles/render/CMakeLists.txt
branches/smoke2/intern/cycles/render/attribute.cpp
branches/smoke2/intern/cycles/render/attribute.h
branches/smoke2/intern/cycles/render/buffers.cpp
branches/smoke2/intern/cycles/render/camera.cpp
branches/smoke2/intern/cycles/render/camera.h
branches/smoke2/intern/cycles/render/film.cpp
branches/smoke2/intern/cycles/render/film.h
branches/smoke2/intern/cycles/render/graph.cpp
branches/smoke2/intern/cycles/render/integrator.cpp
branches/smoke2/intern/cycles/render/integrator.h
branches/smoke2/intern/cycles/render/mesh.cpp
branches/smoke2/intern/cycles/render/mesh.h
branches/smoke2/intern/cycles/render/mesh_displace.cpp
branches/smoke2/intern/cycles/render/nodes.cpp
branches/smoke2/intern/cycles/render/object.cpp
branches/smoke2/intern/cycles/render/object.h
branches/smoke2/intern/cycles/render/scene.cpp
branches/smoke2/intern/cycles/render/scene.h
branches/smoke2/intern/cycles/render/shader.cpp
branches/smoke2/intern/cycles/render/shader.h
branches/smoke2/intern/cycles/render/svm.cpp
branches/smoke2/intern/cycles/render/svm.h
branches/smoke2/intern/cycles/subd/subd_dice.cpp
branches/smoke2/intern/cycles/util/util_math.h
branches/smoke2/intern/cycles/util/util_transform.cpp
branches/smoke2/intern/cycles/util/util_transform.h
branches/smoke2/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/smoke2/intern/guardedalloc/cpp/mallocn.cpp
branches/smoke2/intern/tools/bpy_introspect_ui.py
branches/smoke2/intern/tools/credits_svn_gen.py
branches/smoke2/intern/tools/dump_rna2xml.py
branches/smoke2/release/scripts/startup/bl_operators/image.py
branches/smoke2/release/scripts/startup/bl_ui/properties_animviz.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_camera.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_curve.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/smoke2/release/scripts/startup/bl_ui/properties_game.py
branches/smoke2/release/scripts/startup/bl_ui/properties_object.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
branches/smoke2/release/scripts/startup/bl_ui/space_info.py
branches/smoke2/release/scripts/startup/bl_ui/space_text.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
branches/smoke2/source/blender/avi/AVI_avi.h
branches/smoke2/source/blender/avi/intern/avi.c
branches/smoke2/source/blender/avi/intern/avirgb.c
branches/smoke2/source/blender/avi/intern/codecs.c
branches/smoke2/source/blender/avi/intern/endian.c
branches/smoke2/source/blender/avi/intern/endian.h
branches/smoke2/source/blender/avi/intern/mjpeg.c
branches/smoke2/source/blender/avi/intern/options.c
branches/smoke2/source/blender/avi/intern/rgb32.c
branches/smoke2/source/blender/blenfont/intern/blf_internal_types.h
branches/smoke2/source/blender/blenkernel/BKE_DerivedMesh.h
branches/smoke2/source/blender/blenkernel/BKE_action.h
branches/smoke2/source/blender/blenkernel/BKE_armature.h
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_brush.h
branches/smoke2/source/blender/blenkernel/BKE_camera.h
branches/smoke2/source/blender/blenkernel/BKE_constraint.h
branches/smoke2/source/blender/blenkernel/BKE_customdata.h
branches/smoke2/source/blender/blenkernel/BKE_deform.h
branches/smoke2/source/blender/blenkernel/BKE_displist.h
branches/smoke2/source/blender/blenkernel/BKE_dynamicpaint.h
branches/smoke2/source/blender/blenkernel/BKE_font.h
branches/smoke2/source/blender/blenkernel/BKE_gpencil.h
branches/smoke2/source/blender/blenkernel/BKE_group.h
branches/smoke2/source/blender/blenkernel/BKE_image.h
branches/smoke2/source/blender/blenkernel/BKE_ipo.h
branches/smoke2/source/blender/blenkernel/BKE_key.h
branches/smoke2/source/blender/blenkernel/BKE_lamp.h
branches/smoke2/source/blender/blenkernel/BKE_lattice.h
branches/smoke2/source/blender/blenkernel/BKE_library.h
branches/smoke2/source/blender/blenkernel/BKE_material.h
branches/smoke2/source/blender/blenkernel/BKE_mesh.h
branches/smoke2/source/blender/blenkernel/BKE_node.h
branches/smoke2/source/blender/blenkernel/BKE_object.h
branches/smoke2/source/blender/blenkernel/BKE_ocean.h
branches/smoke2/source/blender/blenkernel/BKE_paint.h
branches/smoke2/source/blender/blenkernel/BKE_particle.h
branches/smoke2/source/blender/blenkernel/BKE_scene.h
branches/smoke2/source/blender/blenkernel/BKE_screen.h
branches/smoke2/source/blender/blenkernel/BKE_sound.h
branches/smoke2/source/blender/blenkernel/BKE_speaker.h
branches/smoke2/source/blender/blenkernel/BKE_text.h
branches/smoke2/source/blender/blenkernel/BKE_texture.h
branches/smoke2/source/blender/blenkernel/BKE_tracking.h
branches/smoke2/source/blender/blenkernel/BKE_utildefines.h
branches/smoke2/source/blender/blenkernel/BKE_world.h
branches/smoke2/source/blender/blenkernel/intern/DerivedMesh.c
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/anim.c
branches/smoke2/source/blender/blenkernel/intern/anim_sys.c
branches/smoke2/source/blender/blenkernel/intern/armature.c
branches/smoke2/source/blender/blenkernel/intern/blender.c
branches/smoke2/source/blender/blenkernel/intern/booleanops_mesh.c
branches/smoke2/source/blender/blenkernel/intern/brush.c
branches/smoke2/source/blender/blenkernel/intern/camera.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/constraint.c
branches/smoke2/source/blender/blenkernel/intern/context.c
branches/smoke2/source/blender/blenkernel/intern/curve.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
branches/smoke2/source/blender/blenkernel/intern/displist.c
branches/smoke2/source/blender/blenkernel/intern/dynamicpaint.c
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/effect.c
branches/smoke2/source/blender/blenkernel/intern/fcurve.c
branches/smoke2/source/blender/blenkernel/intern/fluidsim.c
branches/smoke2/source/blender/blenkernel/intern/font.c
branches/smoke2/source/blender/blenkernel/intern/gpencil.c
branches/smoke2/source/blender/blenkernel/intern/group.c
branches/smoke2/source/blender/blenkernel/intern/image.c
branches/smoke2/source/blender/blenkernel/intern/ipo.c
branches/smoke2/source/blender/blenkernel/intern/key.c
branches/smoke2/source/blender/blenkernel/intern/lamp.c
branches/smoke2/source/blender/blenkernel/intern/lattice.c
branches/smoke2/source/blender/blenkernel/intern/library.c
branches/smoke2/source/blender/blenkernel/intern/material.c
branches/smoke2/source/blender/blenkernel/intern/mball.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/movieclip.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/node.c
branches/smoke2/source/blender/blenkernel/intern/object.c
branches/smoke2/source/blender/blenkernel/intern/ocean.c
branches/smoke2/source/blender/blenkernel/intern/paint.c
branches/smoke2/source/blender/blenkernel/intern/particle.c
branches/smoke2/source/blender/blenkernel/intern/particle_system.c
branches/smoke2/source/blender/blenkernel/intern/pointcache.c
branches/smoke2/source/blender/blenkernel/intern/scene.c
branches/smoke2/source/blender/blenkernel/intern/screen.c
branches/smoke2/source/blender/blenkernel/intern/sequencer.c
branches/smoke2/source/blender/blenkernel/intern/shrinkwrap.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/sound.c
branches/smoke2/source/blender/blenkernel/intern/speaker.c
branches/smoke2/source/blender/blenkernel/intern/subsurf_ccg.c
branches/smoke2/source/blender/blenkernel/intern/text.c
branches/smoke2/source/blender/blenkernel/intern/texture.c
branches/smoke2/source/blender/blenkernel/intern/tracking.c
branches/smoke2/source/blender/blenkernel/intern/world.c
branches/smoke2/source/blender/blenkernel/intern/writeffmpeg.c
branches/smoke2/source/blender/blenkernel/intern/writeframeserver.c
branches/smoke2/source/blender/blenlib/BLI_boxpack2d.h
branches/smoke2/source/blender/blenlib/BLI_bpath.h
branches/smoke2/source/blender/blenlib/BLI_callbacks.h
branches/smoke2/source/blender/blenlib/BLI_fileops.h
branches/smoke2/source/blender/blenlib/BLI_ghash.h
branches/smoke2/source/blender/blenlib/BLI_jitter.h
branches/smoke2/source/blender/blenlib/BLI_math_matrix.h
branches/smoke2/source/blender/blenlib/BLI_memarena.h
branches/smoke2/source/blender/blenlib/BLI_scanfill.h
branches/smoke2/source/blender/blenlib/BLI_threads.h
branches/smoke2/source/blender/blenlib/BLI_uvproject.h
branches/smoke2/source/blender/blenlib/BLI_voxel.h
branches/smoke2/source/blender/blenlib/PIL_time.h
branches/smoke2/source/blender/blenlib/intern/BLI_args.c
branches/smoke2/source/blender/blenlib/intern/BLI_ghash.c
branches/smoke2/source/blender/blenlib/intern/boxpack2d.c
branches/smoke2/source/blender/blenlib/intern/bpath.c
branches/smoke2/source/blender/blenlib/intern/callbacks.c
branches/smoke2/source/blender/blenlib/intern/cpu.c
branches/smoke2/source/blender/blenlib/intern/freetypefont.c
branches/smoke2/source/blender/blenlib/intern/jitter.c
branches/smoke2/source/blender/blenlib/intern/math_matrix.c
branches/smoke2/source/blender/blenlib/intern/noise.c
branches/smoke2/source/blender/blenlib/intern/scanfill.c
branches/smoke2/source/blender/blenlib/intern/storage.c
branches/smoke2/source/blender/blenlib/intern/string_cursor_utf8.c
branches/smoke2/source/blender/blenlib/intern/threads.c
branches/smoke2/source/blender/blenlib/intern/uvproject.c
branches/smoke2/source/blender/blenlib/intern/voxel.c
branches/smoke2/source/blender/blenloader/CMakeLists.txt
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/blenloader/intern/readfile.h
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/blenpluginapi/documentation.h
branches/smoke2/source/blender/blenpluginapi/externdef.h
branches/smoke2/source/blender/blenpluginapi/floatpatch.h
branches/smoke2/source/blender/blenpluginapi/iff.h
branches/smoke2/source/blender/blenpluginapi/plugin.h
branches/smoke2/source/blender/blenpluginapi/util.h
branches/smoke2/source/blender/bmesh/intern/bmesh_construct.c
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/intern/bmesh_interp.c
branches/smoke2/source/blender/bmesh/intern/bmesh_interp.h
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh_validate.c
branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators.h
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
branches/smoke2/source/blender/bmesh/operators/bmo_bevel.c
branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
branches/smoke2/source/blender/bmesh/operators/bmo_dupe.c
branches/smoke2/source/blender/bmesh/operators/bmo_hull.c
branches/smoke2/source/blender/bmesh/operators/bmo_inset.c
branches/smoke2/source/blender/bmesh/operators/bmo_primitive.c
branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.c
branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.h
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/bmesh/operators/bmo_wireframe.c
branches/smoke2/source/blender/bmesh/tools/BME_bevel.c
branches/smoke2/source/blender/collada/AnimationExporter.cpp
branches/smoke2/source/blender/collada/AnimationImporter.cpp
branches/smoke2/source/blender/collada/AnimationImporter.h
branches/smoke2/source/blender/collada/ArmatureExporter.cpp
branches/smoke2/source/blender/collada/ArmatureImporter.cpp
branches/smoke2/source/blender/collada/CameraExporter.cpp
branches/smoke2/source/blender/collada/DocumentImporter.cpp
branches/smoke2/source/blender/collada/DocumentImporter.h
branches/smoke2/source/blender/collada/MeshImporter.cpp
branches/smoke2/source/blender/collada/MeshImporter.h
branches/smoke2/source/blender/collada/SkinInfo.cpp
branches/smoke2/source/blender/collada/SkinInfo.h
branches/smoke2/source/blender/collada/TransformWriter.cpp
branches/smoke2/source/blender/collada/collada_utils.cpp
branches/smoke2/source/blender/collada/collada_utils.h
branches/smoke2/source/blender/editors/animation/anim_deps.c
branches/smoke2/source/blender/editors/animation/anim_filter.c
branches/smoke2/source/blender/editors/animation/anim_markers.c
branches/smoke2/source/blender/editors/animation/keyframing.c
branches/smoke2/source/blender/editors/animation/keyingsets.c
branches/smoke2/source/blender/editors/armature/editarmature.c
branches/smoke2/source/blender/editors/armature/editarmature_retarget.c
branches/smoke2/source/blender/editors/armature/poseSlide.c
branches/smoke2/source/blender/editors/armature/poseUtils.c
branches/smoke2/source/blender/editors/armature/poselib.c
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/curve/editfont.c
branches/smoke2/source/blender/editors/datafiles/Bfont.c
branches/smoke2/source/blender/editors/datafiles/startup.blend.c
branches/smoke2/source/blender/editors/gpencil/gpencil_edit.c
branches/smoke2/source/blender/editors/gpencil/gpencil_paint.c
branches/smoke2/source/blender/editors/gpencil/gpencil_undo.c
branches/smoke2/source/blender/editors/include/BIF_glutil.h
branches/smoke2/source/blender/editors/include/ED_clip.h
branches/smoke2/source/blender/editors/include/ED_fluidsim.h
branches/smoke2/source/blender/editors/include/ED_keyframing.h
branches/smoke2/source/blender/editors/include/ED_particle.h
branches/smoke2/source/blender/editors/include/ED_physics.h
branches/smoke2/source/blender/editors/include/ED_sculpt.h
branches/smoke2/source/blender/editors/include/ED_view3d.h
branches/smoke2/source/blender/editors/include/UI_resources.h
branches/smoke2/source/blender/editors/interface/interface.c
branches/smoke2/source/blender/editors/interface/interface_draw.c
branches/smoke2/source/blender/editors/interface/interface_handlers.c
branches/smoke2/source/blender/editors/interface/interface_layout.c
branches/smoke2/source/blender/editors/interface/interface_ops.c
branches/smoke2/source/blender/editors/interface/interface_templates.c
branches/smoke2/source/blender/editors/interface/interface_utils.c
branches/smoke2/source/blender/editors/interface/resources.c
branches/smoke2/source/blender/editors/mesh/editface.c
branches/smoke2/source/blender/editors/mesh/editmesh_add.c
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_loopcut.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_slide.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/editmesh_utils.c
branches/smoke2/source/blender/editors/mesh/mesh_data.c
branches/smoke2/source/blender/editors/mesh/mesh_navmesh.c
branches/smoke2/source/blender/editors/mesh/meshtools.c
branches/smoke2/source/blender/editors/object/object_add.c
branches/smoke2/source/blender/editors/object/object_bake.c
branches/smoke2/source/blender/editors/object/object_constraint.c
branches/smoke2/source/blender/editors/object/object_edit.c
branches/smoke2/source/blender/editors/object/object_group.c
branches/smoke2/source/blender/editors/object/object_hook.c
branches/smoke2/source/blender/editors/object/object_lattice.c
branches/smoke2/source/blender/editors/object/object_modifier.c
branches/smoke2/source/blender/editors/object/object_relations.c
branches/smoke2/source/blender/editors/object/object_select.c
branches/smoke2/source/blender/editors/object/object_shapekey.c
branches/smoke2/source/blender/editors/object/object_transform.c
branches/smoke2/source/blender/editors/object/object_vgroup.c
branches/smoke2/source/blender/editors/physics/particle_boids.c
branches/smoke2/source/blender/editors/physics/particle_edit.c
branches/smoke2/source/blender/editors/physics/particle_object.c
branches/smoke2/source/blender/editors/physics/physics_fluid.c
branches/smoke2/source/blender/editors/render/render_internal.c
branches/smoke2/source/blender/editors/render/render_opengl.c
branches/smoke2/source/blender/editors/render/render_preview.c
branches/smoke2/source/blender/editors/render/render_shading.c
branches/smoke2/source/blender/editors/screen/area.c
branches/smoke2/source/blender/editors/screen/glutil.c
branches/smoke2/source/blender/editors/screen/screen_context.c
branches/smoke2/source/blender/editors/screen/screen_edit.c
branches/smoke2/source/blender/editors/screen/screen_ops.c
branches/smoke2/source/blender/editors/screen/screendump.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_cursor.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_hide.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_image.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_intern.h
branches/smoke2/source/blender/editors/sculpt_paint/paint_ops.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_stroke.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_undo.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_utils.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/smoke2/source/blender/editors/sound/sound_ops.c
branches/smoke2/source/blender/editors/space_action/action_edit.c
branches/smoke2/source/blender/editors/space_buttons/buttons_context.c
branches/smoke2/source/blender/editors/space_buttons/buttons_texture.c
branches/smoke2/source/blender/editors/space_clip/CMakeLists.txt
branches/smoke2/source/blender/editors/space_clip/SConscript
branches/smoke2/source/blender/editors/space_clip/clip_buttons.c
branches/smoke2/source/blender/editors/space_clip/clip_draw.c
branches/smoke2/source/blender/editors/space_clip/clip_editor.c
branches/smoke2/source/blender/editors/space_clip/clip_graph_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_intern.h
branches/smoke2/source/blender/editors/space_clip/clip_ops.c
branches/smoke2/source/blender/editors/space_clip/clip_utils.c
branches/smoke2/source/blender/editors/space_clip/space_clip.c
branches/smoke2/source/blender/editors/space_clip/tracking_ops.c
branches/smoke2/source/blender/editors/space_image/image_buttons.c
branches/smoke2/source/blender/editors/space_image/image_draw.c
branches/smoke2/source/blender/editors/space_image/image_ops.c
branches/smoke2/source/blender/editors/space_image/space_image.c
branches/smoke2/source/blender/editors/space_info/info_ops.c
branches/smoke2/source/blender/editors/space_info/info_stats.c
branches/smoke2/source/blender/editors/space_logic/logic_buttons.c
branches/smoke2/source/blender/editors/space_logic/logic_window.c
branches/smoke2/source/blender/editors/space_logic/space_logic.c
branches/smoke2/source/blender/editors/space_nla/nla_edit.c
branches/smoke2/source/blender/editors/space_node/drawnode.c
branches/smoke2/source/blender/editors/space_node/node_buttons.c
branches/smoke2/source/blender/editors/space_node/node_draw.c
branches/smoke2/source/blender/editors/space_node/node_edit.c
branches/smoke2/source/blender/editors/space_node/node_header.c
branches/smoke2/source/blender/editors/space_node/node_intern.h
branches/smoke2/source/blender/editors/space_node/node_ops.c
branches/smoke2/source/blender/editors/space_node/node_templates.c
branches/smoke2/source/blender/editors/space_outliner/outliner_draw.c
branches/smoke2/source/blender/editors/space_outliner/outliner_edit.c
branches/smoke2/source/blender/editors/space_outliner/outliner_select.c
branches/smoke2/source/blender/editors/space_outliner/outliner_tools.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_add.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_edit.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.c
branches/smoke2/source/blender/editors/space_sequencer/space_sequencer.c
branches/smoke2/source/blender/editors/space_text/space_text.c
branches/smoke2/source/blender/editors/space_text/text_intern.h
branches/smoke2/source/blender/editors/space_text/text_ops.c
branches/smoke2/source/blender/editors/space_time/space_time.c
branches/smoke2/source/blender/editors/space_view3d/drawanimviz.c
branches/smoke2/source/blender/editors/space_view3d/drawarmature.c
branches/smoke2/source/blender/editors/space_view3d/drawmesh.c
branches/smoke2/source/blender/editors/space_view3d/drawobject.c
branches/smoke2/source/blender/editors/space_view3d/space_view3d.c
branches/smoke2/source/blender/editors/space_view3d/view3d_buttons.c
branches/smoke2/source/blender/editors/space_view3d/view3d_draw.c
branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
branches/smoke2/source/blender/editors/space_view3d/view3d_fly.c
branches/smoke2/source/blender/editors/space_view3d/view3d_intern.h
branches/smoke2/source/blender/editors/space_view3d/view3d_ops.c
branches/smoke2/source/blender/editors/space_view3d/view3d_select.c
branches/smoke2/source/blender/editors/space_view3d/view3d_snap.c
branches/smoke2/source/blender/editors/space_view3d/view3d_view.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_generics.c
branches/smoke2/source/blender/editors/transform/transform_input.c
branches/smoke2/source/blender/editors/transform/transform_manipulator.c
branches/smoke2/source/blender/editors/transform/transform_ops.c
branches/smoke2/source/blender/editors/transform/transform_snap.c
branches/smoke2/source/blender/editors/uvedit/uvedit_draw.c
branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
branches/smoke2/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/smoke2/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/smoke2/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/smoke2/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/smoke2/source/blender/gpu/CMakeLists.txt
branches/smoke2/source/blender/gpu/GPU_extensions.h
branches/smoke2/source/blender/gpu/GPU_material.h
branches/smoke2/source/blender/gpu/SConscript
branches/smoke2/source/blender/gpu/intern/gpu_codegen.c
branches/smoke2/source/blender/gpu/intern/gpu_draw.c
branches/smoke2/source/blender/gpu/intern/gpu_extensions.c
branches/smoke2/source/blender/gpu/intern/gpu_material.c
branches/smoke2/source/blender/ikplugin/intern/iksolver_plugin.c
branches/smoke2/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/smoke2/source/blender/imbuf/IMB_imbuf_types.h
branches/smoke2/source/blender/imbuf/intern/IMB_allocimbuf.h
branches/smoke2/source/blender/imbuf/intern/IMB_anim.h
branches/smoke2/source/blender/imbuf/intern/IMB_filter.h
branches/smoke2/source/blender/imbuf/intern/cineon/cineonfile.h
branches/smoke2/source/blender/imbuf/intern/cineon/cineonlib.c
branches/smoke2/source/blender/imbuf/intern/cineon/cineonlib.h
branches/smoke2/source/blender/imbuf/intern/cineon/dpxfile.h
branches/smoke2/source/blender/imbuf/intern/cineon/dpxlib.c
branches/smoke2/source/blender/imbuf/intern/cineon/dpxlib.h
branches/smoke2/source/blender/imbuf/intern/cineon/logImageCore.c
branches/smoke2/source/blender/imbuf/intern/cineon/logImageCore.h
branches/smoke2/source/blender/imbuf/intern/cineon/logImageLib.c
branches/smoke2/source/blender/imbuf/intern/cineon/logImageLib.h
branches/smoke2/source/blender/imbuf/intern/cineon/logmemfile.c
branches/smoke2/source/blender/imbuf/intern/cineon/logmemfile.h
branches/smoke2/source/blender/imbuf/intern/filter.c
branches/smoke2/source/blender/imbuf/intern/imageprocess.c
branches/smoke2/source/blender/imbuf/intern/imbuf.h
branches/smoke2/source/blender/imbuf/intern/imbuf_cocoa.m
branches/smoke2/source/blender/imbuf/intern/indexer.c
branches/smoke2/source/blender/imbuf/intern/tiff.c
branches/smoke2/source/blender/imbuf/intern/util.c
branches/smoke2/source/blender/makesdna/DNA_ID.h
branches/smoke2/source/blender/makesdna/DNA_action_types.h
branches/smoke2/source/blender/makesdna/DNA_boid_types.h
branches/smoke2/source/blender/makesdna/DNA_camera_types.h
branches/smoke2/source/blender/makesdna/DNA_curve_types.h
branches/smoke2/source/blender/makesdna/DNA_group_types.h
branches/smoke2/source/blender/makesdna/DNA_image_types.h
branches/smoke2/source/blender/makesdna/DNA_lamp_types.h
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_object_fluidsim.h
branches/smoke2/source/blender/makesdna/DNA_object_force.h
branches/smoke2/source/blender/makesdna/DNA_particle_types.h
branches/smoke2/source/blender/makesdna/DNA_property_types.h
branches/smoke2/source/blender/makesdna/DNA_scene_types.h
branches/smoke2/source/blender/makesdna/DNA_space_types.h
branches/smoke2/source/blender/makesdna/DNA_tracking_types.h
branches/smoke2/source/blender/makesdna/intern/dna_genfile.c
branches/smoke2/source/blender/makesdna/intern/makesdna.c
branches/smoke2/source/blender/makesrna/RNA_access.h
branches/smoke2/source/blender/makesrna/RNA_enum_types.h
branches/smoke2/source/blender/makesrna/RNA_types.h
branches/smoke2/source/blender/makesrna/intern/rna_ID.c
branches/smoke2/source/blender/makesrna/intern/rna_access.c
branches/smoke2/source/blender/makesrna/intern/rna_animation.c
branches/smoke2/source/blender/makesrna/intern/rna_animviz.c
branches/smoke2/source/blender/makesrna/intern/rna_brush.c
branches/smoke2/source/blender/makesrna/intern/rna_camera.c
branches/smoke2/source/blender/makesrna/intern/rna_camera_api.c
branches/smoke2/source/blender/makesrna/intern/rna_constraint.c
branches/smoke2/source/blender/makesrna/intern/rna_curve.c
branches/smoke2/source/blender/makesrna/intern/rna_image.c
branches/smoke2/source/blender/makesrna/intern/rna_image_api.c
branches/smoke2/source/blender/makesrna/intern/rna_lamp.c
branches/smoke2/source/blender/makesrna/intern/rna_lattice.c
branches/smoke2/source/blender/makesrna/intern/rna_main_api.c
branches/smoke2/source/blender/makesrna/intern/rna_material_api.c
branches/smoke2/source/blender/makesrna/intern/rna_nla.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_object.c
branches/smoke2/source/blender/makesrna/intern/rna_object_api.c
branches/smoke2/source/blender/makesrna/intern/rna_pose.c
branches/smoke2/source/blender/makesrna/intern/rna_pose_api.c
branches/smoke2/source/blender/makesrna/intern/rna_scene.c
branches/smoke2/source/blender/makesrna/intern/rna_scene_api.c
branches/smoke2/source/blender/makesrna/intern/rna_screen.c
branches/smoke2/source/blender/makesrna/intern/rna_space.c
branches/smoke2/source/blender/makesrna/intern/rna_text_api.c
branches/smoke2/source/blender/makesrna/intern/rna_tracking.c
branches/smoke2/source/blender/makesrna/intern/rna_userdef.c
branches/smoke2/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/smoke2/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/smoke2/source/blender/modifiers/intern/MOD_array.c
branches/smoke2/source/blender/modifiers/intern/MOD_boolean_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_build.c
branches/smoke2/source/blender/modifiers/intern/MOD_collision.c
branches/smoke2/source/blender/modifiers/intern/MOD_displace.c
branches/smoke2/source/blender/modifiers/intern/MOD_edgesplit.c
branches/smoke2/source/blender/modifiers/intern/MOD_explode.c
branches/smoke2/source/blender/modifiers/intern/MOD_hook.c
branches/smoke2/source/blender/modifiers/intern/MOD_mask.c
branches/smoke2/source/blender/modifiers/intern/MOD_mirror.c
branches/smoke2/source/blender/modifiers/intern/MOD_particlesystem.c
branches/smoke2/source/blender/modifiers/intern/MOD_solidify.c
branches/smoke2/source/blender/modifiers/intern/MOD_util.c
branches/smoke2/source/blender/modifiers/intern/MOD_uvproject.c
branches/smoke2/source/blender/modifiers/intern/MOD_warp.c
branches/smoke2/source/blender/modifiers/intern/MOD_wave.c
branches/smoke2/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/smoke2/source/blender/nodes/composite/node_composite_tree.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_image.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/smoke2/source/blender/nodes/intern/node_common.c
branches/smoke2/source/blender/nodes/shader/node_shader_tree.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_common.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_common.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/smoke2/source/blender/python/intern/bpy.c
branches/smoke2/source/blender/python/intern/bpy_app_handlers.c
branches/smoke2/source/blender/python/intern/bpy_props.c
branches/smoke2/source/blender/python/intern/bpy_rna.c
branches/smoke2/source/blender/python/mathutils/mathutils.h
branches/smoke2/source/blender/python/mathutils/mathutils_Color.c
branches/smoke2/source/blender/python/mathutils/mathutils_Color.h
branches/smoke2/source/blender/python/mathutils/mathutils_Euler.c
branches/smoke2/source/blender/python/mathutils/mathutils_Euler.h
branches/smoke2/source/blender/python/mathutils/mathutils_Matrix.c
branches/smoke2/source/blender/python/mathutils/mathutils_Quaternion.h
branches/smoke2/source/blender/python/mathutils/mathutils_Vector.h
branches/smoke2/source/blender/python/mathutils/mathutils_geometry.c
branches/smoke2/source/blender/python/mathutils/mathutils_geometry.h
branches/smoke2/source/blender/quicktime/apple/quicktime_export.c
branches/smoke2/source/blender/quicktime/apple/quicktime_import.c
branches/smoke2/source/blender/render/intern/include/gammaCorrectionTables.h
branches/smoke2/source/blender/render/intern/include/initrender.h
branches/smoke2/source/blender/render/intern/include/occlusion.h
branches/smoke2/source/blender/render/intern/include/rendercore.h
branches/smoke2/source/blender/render/intern/include/shadbuf.h
branches/smoke2/source/blender/render/intern/include/strand.h
branches/smoke2/source/blender/render/intern/include/texture.h
branches/smoke2/source/blender/render/intern/raytrace/rayobject.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_internal.h
branches/smoke2/source/blender/render/intern/source/convertblender.c
branches/smoke2/source/blender/render/intern/source/envmap.c
branches/smoke2/source/blender/render/intern/source/external_engine.c
branches/smoke2/source/blender/render/intern/source/gammaCorrectionTables.c
branches/smoke2/source/blender/render/intern/source/imagetexture.c
branches/smoke2/source/blender/render/intern/source/initrender.c
branches/smoke2/source/blender/render/intern/source/occlusion.c
branches/smoke2/source/blender/render/intern/source/pipeline.c
branches/smoke2/source/blender/render/intern/source/pixelblending.c
branches/smoke2/source/blender/render/intern/source/pointdensity.c
branches/smoke2/source/blender/render/intern/source/render_result.c
branches/smoke2/source/blender/render/intern/source/render_texture.c
branches/smoke2/source/blender/render/intern/source/rendercore.c
branches/smoke2/source/blender/render/intern/source/shadbuf.c
branches/smoke2/source/blender/render/intern/source/sss.c
branches/smoke2/source/blender/render/intern/source/strand.c
branches/smoke2/source/blender/render/intern/source/volume_precache.c
branches/smoke2/source/blender/render/intern/source/volumetric.c
branches/smoke2/source/blender/render/intern/source/voxeldata.c
branches/smoke2/source/blender/render/intern/source/zbuf.c
branches/smoke2/source/blender/windowmanager/intern/wm.c
branches/smoke2/source/blender/windowmanager/intern/wm_draw.c
branches/smoke2/source/blender/windowmanager/intern/wm_event_system.c
branches/smoke2/source/blender/windowmanager/intern/wm_files.c
branches/smoke2/source/blender/windowmanager/intern/wm_gesture.c
branches/smoke2/source/blender/windowmanager/intern/wm_init_exit.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/blender/windowmanager/intern/wm_subwindow.c
branches/smoke2/source/blender/windowmanager/intern/wm_window.c
branches/smoke2/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/smoke2/source/creator/CMakeLists.txt
branches/smoke2/source/creator/creator.c
branches/smoke2/source/gameengine/Converter/BL_ActionActuator.cpp
branches/smoke2/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/smoke2/source/gameengine/Converter/BL_ArmatureObject.h
branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/smoke2/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/smoke2/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/smoke2/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/smoke2/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/smoke2/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/smoke2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/smoke2/source/gameengine/Ketsji/KX_Light.cpp
branches/smoke2/source/gameengine/Ketsji/KX_Light.h
branches/smoke2/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/smoke2/source/gameengine/VideoTexture/Texture.cpp
branches/smoke2/source/tools/tag_release.py
branches/smoke2/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/smoke2/doc/python_api/examples/bpy.ops.2.py
branches/smoke2/doc/python_api/examples/bpy.ops.3.py
branches/smoke2/release/scripts/presets/tracking_settings/blurry_movie.py
branches/smoke2/source/blender/blenloader/intern/versioning_250.c
branches/smoke2/source/blender/blenloader/intern/versioning_legacy.c
branches/smoke2/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/smoke2/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/smoke2/source/blender/gpu/shaders/
branches/smoke2/source/tools/GL/
branches/smoke2/source/tools/check_style_c.py
Removed Paths:
-------------
branches/smoke2/source/blender/gpu/intern/gpu_shader_material.glsl
branches/smoke2/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/smoke2/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/smoke2/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
Property Changed:
----------------
branches/smoke2/source/blender/editors/interface/interface.c
branches/smoke2/source/blender/editors/space_outliner/
Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/CMakeLists.txt 2012-05-05 19:15:33 UTC (rev 46324)
@@ -229,6 +229,9 @@
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)
@@ -304,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()
@@ -1614,13 +1617,50 @@
"Python.h for python version \"${PYTHON_VERSION}\"")
endif()
- if(WITH_PYTHON_INSTALL_NUMPY)
- if(NOT EXISTS "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy")
- message(WARNING "Numpy path '${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy' is missing, "
+ 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
+ NO_DEFAULT_PATH
+ )
+
+ 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()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
Modified: branches/smoke2/GNUmakefile
===================================================================
--- branches/smoke2/GNUmakefile 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/GNUmakefile 2012-05-05 19:15:33 UTC (rev 46324)
@@ -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/smoke2/SConstruct
===================================================================
--- branches/smoke2/SConstruct 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/SConstruct 2012-05-05 19:15:33 UTC (rev 46324)
@@ -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/smoke2/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_consistency_check.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_consistency_check.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_netbeans_project.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_netbeans_project.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_qtcreator_project.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_qtcreator_project.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_static_check_cppcheck.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_static_check_cppcheck.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_static_check_sparse.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_static_check_sparse.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/smoke2/build_files/cmake/cmake_static_check_splint.py 2012-05-05 18:48:58 UTC (rev 46323)
+++ branches/smoke2/build_files/cmake/cmake_static_check_splint.py 2012-05-05 19:15:33 UTC (rev 46324)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.2
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/smoke2/build_files/cmake/example_scripts/make_quicky.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list