[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46817] branches/smoke2: Merge from trunk r46614-r46814
Daniel Genrich
daniel.genrich at gmx.net
Sun May 20 21:35:50 CEST 2012
Revision: 46817
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46817
Author: genscher
Date: 2012-05-20 19:35:49 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Merge from trunk r46614-r46814
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46614
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46814
Modified Paths:
--------------
branches/smoke2/CMakeLists.txt
branches/smoke2/GNUmakefile
branches/smoke2/build_files/cmake/macros.cmake
branches/smoke2/build_files/cmake/packaging.cmake
branches/smoke2/build_files/package_spec/rpm/blender.spec.in
branches/smoke2/build_files/scons/config/win64-mingw-config.py
branches/smoke2/extern/bullet2/readme.txt
branches/smoke2/extern/bullet2/src/LinearMath/btSerializer.h
branches/smoke2/extern/eltopo/CMakeLists.txt
branches/smoke2/extern/eltopo/common/ccd_defs.h
branches/smoke2/extern/eltopo/eltopo3d/collisionpipeline.cpp
branches/smoke2/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/smoke2/extern/eltopo/eltopo3d/dynamicsurface.h
branches/smoke2/extern/eltopo/eltopo3d/eltopo.cpp
branches/smoke2/intern/audaspace/CMakeLists.txt
branches/smoke2/intern/cycles/blender/blender_session.cpp
branches/smoke2/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/smoke2/intern/cycles/kernel/svm/svm_tex_coord.h
branches/smoke2/intern/cycles/render/film.cpp
branches/smoke2/intern/elbeem/CMakeLists.txt
branches/smoke2/intern/elbeem/intern/ntl_blenderdumper.cpp
branches/smoke2/intern/elbeem/intern/ntl_geometryobject.cpp
branches/smoke2/intern/elbeem/intern/ntl_vector3dim.h
branches/smoke2/intern/elbeem/intern/ntl_world.cpp
branches/smoke2/intern/elbeem/intern/particletracer.cpp
branches/smoke2/intern/elbeem/intern/solver_adap.cpp
branches/smoke2/intern/elbeem/intern/solver_init.cpp
branches/smoke2/intern/elbeem/intern/solver_main.cpp
branches/smoke2/intern/elbeem/intern/solver_relax.h
branches/smoke2/intern/elbeem/intern/solver_util.cpp
branches/smoke2/intern/ghost/GHOST_C-api.h
branches/smoke2/intern/ghost/GHOST_IEvent.h
branches/smoke2/intern/ghost/GHOST_IEventConsumer.h
branches/smoke2/intern/ghost/GHOST_ISystem.h
branches/smoke2/intern/ghost/GHOST_ISystemPaths.h
branches/smoke2/intern/ghost/GHOST_ITimerTask.h
branches/smoke2/intern/ghost/GHOST_IWindow.h
branches/smoke2/intern/ghost/GHOST_Path-api.h
branches/smoke2/intern/ghost/GHOST_Rect.h
branches/smoke2/intern/ghost/GHOST_Types.h
branches/smoke2/intern/ghost/intern/GHOST_Buttons.cpp
branches/smoke2/intern/ghost/intern/GHOST_Buttons.h
branches/smoke2/intern/ghost/intern/GHOST_C-api.cpp
branches/smoke2/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/smoke2/intern/ghost/intern/GHOST_CallbackEventConsumer.h
branches/smoke2/intern/ghost/intern/GHOST_DisplayManager.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerX11.h
branches/smoke2/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/smoke2/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_DropTargetX11.h
branches/smoke2/intern/ghost/intern/GHOST_Event.h
branches/smoke2/intern/ghost/intern/GHOST_EventButton.h
branches/smoke2/intern/ghost/intern/GHOST_EventCursor.h
branches/smoke2/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/smoke2/intern/ghost/intern/GHOST_EventKey.h
branches/smoke2/intern/ghost/intern/GHOST_EventManager.cpp
branches/smoke2/intern/ghost/intern/GHOST_EventManager.h
branches/smoke2/intern/ghost/intern/GHOST_EventNDOF.h
branches/smoke2/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/smoke2/intern/ghost/intern/GHOST_EventPrinter.h
branches/smoke2/intern/ghost/intern/GHOST_EventString.h
branches/smoke2/intern/ghost/intern/GHOST_EventTrackpad.h
branches/smoke2/intern/ghost/intern/GHOST_EventWheel.h
branches/smoke2/intern/ghost/intern/GHOST_ISystem.cpp
branches/smoke2/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/smoke2/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/smoke2/intern/ghost/intern/GHOST_ModifierKeys.h
branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/smoke2/intern/ghost/intern/GHOST_NDOFManager.h
branches/smoke2/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_Path-api.cpp
branches/smoke2/intern/ghost/intern/GHOST_Rect.cpp
branches/smoke2/intern/ghost/intern/GHOST_System.cpp
branches/smoke2/intern/ghost/intern/GHOST_System.h
branches/smoke2/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemCarbon.h
branches/smoke2/intern/ghost/intern/GHOST_SystemCocoa.h
branches/smoke2/intern/ghost/intern/GHOST_SystemNULL.h
branches/smoke2/intern/ghost/intern/GHOST_SystemPaths.h
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/smoke2/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemSDL.h
branches/smoke2/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemWin32.h
branches/smoke2/intern/ghost/intern/GHOST_SystemX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemX11.h
branches/smoke2/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/smoke2/intern/ghost/intern/GHOST_TimerManager.cpp
branches/smoke2/intern/ghost/intern/GHOST_TimerManager.h
branches/smoke2/intern/ghost/intern/GHOST_TimerTask.h
branches/smoke2/intern/ghost/intern/GHOST_Window.cpp
branches/smoke2/intern/ghost/intern/GHOST_Window.h
branches/smoke2/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowCarbon.h
branches/smoke2/intern/ghost/intern/GHOST_WindowCocoa.h
branches/smoke2/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/smoke2/intern/ghost/intern/GHOST_WindowManager.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowManager.h
branches/smoke2/intern/ghost/intern/GHOST_WindowNULL.h
branches/smoke2/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowSDL.h
branches/smoke2/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowWin32.h
branches/smoke2/intern/ghost/intern/GHOST_WindowX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowX11.h
branches/smoke2/intern/ghost/test/gears/GHOST_Test.cpp
branches/smoke2/release/scripts/startup/bl_operators/console.py
branches/smoke2/release/scripts/startup/bl_operators/image.py
branches/smoke2/release/scripts/startup/bl_operators/object.py
branches/smoke2/release/scripts/startup/bl_operators/presets.py
branches/smoke2/release/scripts/startup/bl_operators/wm.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_bone.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/smoke2/release/scripts/startup/bl_ui/properties_object.py
branches/smoke2/release/scripts/startup/bl_ui/properties_paint_common.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_field.py
branches/smoke2/release/scripts/startup/bl_ui/properties_scene.py
branches/smoke2/release/scripts/startup/bl_ui/properties_texture.py
branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
branches/smoke2/release/scripts/startup/bl_ui/space_node.py
branches/smoke2/release/scripts/startup/bl_ui/space_sequencer.py
branches/smoke2/release/scripts/startup/bl_ui/space_text.py
branches/smoke2/release/scripts/startup/bl_ui/space_time.py
branches/smoke2/release/scripts/startup/bl_ui/space_userpref.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/smoke2/source/blender/CMakeLists.txt
branches/smoke2/source/blender/SConscript
branches/smoke2/source/blender/avi/intern/avirgb.c
branches/smoke2/source/blender/blenkernel/BKE_ccg.h
branches/smoke2/source/blender/blenkernel/BKE_colortools.h
branches/smoke2/source/blender/blenkernel/BKE_customdata.h
branches/smoke2/source/blender/blenkernel/BKE_image.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_sequencer.h
branches/smoke2/source/blender/blenkernel/CMakeLists.txt
branches/smoke2/source/blender/blenkernel/intern/CCGSubSurf.c
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/anim.c
branches/smoke2/source/blender/blenkernel/intern/armature.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/cloth.c
branches/smoke2/source/blender/blenkernel/intern/collision.c
branches/smoke2/source/blender/blenkernel/intern/colortools.c
branches/smoke2/source/blender/blenkernel/intern/context.c
branches/smoke2/source/blender/blenkernel/intern/curve.c
branches/smoke2/source/blender/blenkernel/intern/deform.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/fcurve.c
branches/smoke2/source/blender/blenkernel/intern/font.c
branches/smoke2/source/blender/blenkernel/intern/group.c
branches/smoke2/source/blender/blenkernel/intern/icons.c
branches/smoke2/source/blender/blenkernel/intern/idprop.c
branches/smoke2/source/blender/blenkernel/intern/image.c
branches/smoke2/source/blender/blenkernel/intern/lattice.c
branches/smoke2/source/blender/blenkernel/intern/mball.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/modifier.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/nla.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/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/screen.c
branches/smoke2/source/blender/blenkernel/intern/seqeffects.c
branches/smoke2/source/blender/blenkernel/intern/sequencer.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/sound.c
branches/smoke2/source/blender/blenkernel/intern/subsurf_ccg.c
branches/smoke2/source/blender/blenkernel/intern/text.c
branches/smoke2/source/blender/blenkernel/intern/tracking.c
branches/smoke2/source/blender/blenlib/BLI_ghash.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/BLI_kdopbvh.c
branches/smoke2/source/blender/blenlib/intern/fnmatch.c
branches/smoke2/source/blender/blenlib/intern/path_util.c
branches/smoke2/source/blender/blenlib/intern/pbvh.c
branches/smoke2/source/blender/blenlib/intern/uvproject.c
branches/smoke2/source/blender/blenlib/intern/winstuff.c
branches/smoke2/source/blender/blenloader/intern/readblenentry.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/blenloader/intern/versioning_250.c
branches/smoke2/source/blender/blenloader/intern/versioning_legacy.c
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mods.c
branches/smoke2/source/blender/bmesh/intern/bmesh_opdefines.c
branches/smoke2/source/blender/bmesh/intern/bmesh_operators.c
branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.c
branches/smoke2/source/blender/bmesh/intern/bmesh_walkers.c
branches/smoke2/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/smoke2/source/blender/bmesh/operators/bmo_create.c
branches/smoke2/source/blender/bmesh/operators/bmo_dupe.c
branches/smoke2/source/blender/bmesh/operators/bmo_hull.c
branches/smoke2/source/blender/bmesh/tools/BME_bevel.c
branches/smoke2/source/blender/collada/GeometryExporter.cpp
branches/smoke2/source/blender/collada/GeometryExporter.h
branches/smoke2/source/blender/collada/MeshImporter.cpp
branches/smoke2/source/blender/collada/MeshImporter.h
branches/smoke2/source/blender/editors/animation/anim_channels_defines.c
branches/smoke2/source/blender/editors/animation/anim_channels_edit.c
branches/smoke2/source/blender/editors/animation/anim_draw.c
branches/smoke2/source/blender/editors/animation/anim_filter.c
branches/smoke2/source/blender/editors/animation/drivers.c
branches/smoke2/source/blender/editors/armature/editarmature.c
branches/smoke2/source/blender/editors/armature/editarmature_retarget.c
branches/smoke2/source/blender/editors/armature/editarmature_sketch.c
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/armature/reeb.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/gpencil/gpencil_paint.c
branches/smoke2/source/blender/editors/include/ED_clip.h
branches/smoke2/source/blender/editors/include/ED_mesh.h
branches/smoke2/source/blender/editors/include/ED_transform.h
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_icons.c
branches/smoke2/source/blender/editors/interface/interface_intern.h
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_panel.c
branches/smoke2/source/blender/editors/interface/interface_regions.c
branches/smoke2/source/blender/editors/interface/resources.c
branches/smoke2/source/blender/editors/interface/view2d.c
branches/smoke2/source/blender/editors/mesh/editface.c
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.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_ops.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_modifier.c
branches/smoke2/source/blender/editors/object/object_ops.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_transform.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_preview.c
branches/smoke2/source/blender/editors/render/render_shading.c
branches/smoke2/source/blender/editors/render/render_update.c
branches/smoke2/source/blender/editors/screen/area.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_ops.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/space_api/spacetypes.c
branches/smoke2/source/blender/editors/space_clip/clip_editor.c
branches/smoke2/source/blender/editors/space_clip/clip_intern.h
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_console/console_ops.c
branches/smoke2/source/blender/editors/space_file/file_ops.c
branches/smoke2/source/blender/editors/space_file/file_panels.c
branches/smoke2/source/blender/editors/space_file/filelist.c
branches/smoke2/source/blender/editors/space_file/fsmenu.c
branches/smoke2/source/blender/editors/space_file/fsmenu.h
branches/smoke2/source/blender/editors/space_file/space_file.c
branches/smoke2/source/blender/editors/space_image/image_ops.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_nla/nla_buttons.c
branches/smoke2/source/blender/editors/space_nla/nla_draw.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_draw.c
branches/smoke2/source/blender/editors/space_node/node_edit.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_sequencer/sequencer_edit.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.c
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_userpref/space_userpref.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/view3d_draw.c
branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
branches/smoke2/source/blender/editors/space_view3d/view3d_select.c
branches/smoke2/source/blender/editors/space_view3d/view3d_toolbar.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_orientations.c
branches/smoke2/source/blender/editors/transform/transform_snap.c
branches/smoke2/source/blender/editors/util/editmode_undo.c
branches/smoke2/source/blender/editors/util/undo.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_smart_stitch.c
branches/smoke2/source/blender/gpu/intern/gpu_buffers.c
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/gpu/shaders/gpu_shader_material.glsl
branches/smoke2/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/smoke2/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/smoke2/source/blender/imbuf/intern/IMB_anim.h
branches/smoke2/source/blender/imbuf/intern/IMB_metadata.h
branches/smoke2/source/blender/imbuf/intern/allocimbuf.c
branches/smoke2/source/blender/imbuf/intern/anim_movie.c
branches/smoke2/source/blender/imbuf/intern/bmp.c
branches/smoke2/source/blender/imbuf/intern/cache.c
branches/smoke2/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/smoke2/source/blender/imbuf/intern/divers.c
branches/smoke2/source/blender/imbuf/intern/filetype.c
branches/smoke2/source/blender/imbuf/intern/filter.c
branches/smoke2/source/blender/imbuf/intern/imageprocess.c
branches/smoke2/source/blender/imbuf/intern/indexer.c
branches/smoke2/source/blender/imbuf/intern/indexer_dv.c
branches/smoke2/source/blender/imbuf/intern/iris.c
branches/smoke2/source/blender/imbuf/intern/jp2.c
branches/smoke2/source/blender/imbuf/intern/jpeg.c
branches/smoke2/source/blender/imbuf/intern/metadata.c
branches/smoke2/source/blender/imbuf/intern/moviecache.c
branches/smoke2/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/smoke2/source/blender/imbuf/intern/png.c
branches/smoke2/source/blender/imbuf/intern/radiance_hdr.c
branches/smoke2/source/blender/imbuf/intern/readimage.c
branches/smoke2/source/blender/imbuf/intern/rotate.c
branches/smoke2/source/blender/imbuf/intern/scaling.c
branches/smoke2/source/blender/imbuf/intern/targa.c
branches/smoke2/source/blender/imbuf/intern/thumbs.c
branches/smoke2/source/blender/imbuf/intern/thumbs_blend.c
branches/smoke2/source/blender/imbuf/intern/tiff.c
branches/smoke2/source/blender/imbuf/intern/util.c
branches/smoke2/source/blender/imbuf/intern/writeimage.c
branches/smoke2/source/blender/makesdna/DNA_meshdata_types.h
branches/smoke2/source/blender/makesdna/DNA_modifier_types.h
branches/smoke2/source/blender/makesdna/DNA_movieclip_types.h
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_scene_types.h
branches/smoke2/source/blender/makesdna/DNA_texture_types.h
branches/smoke2/source/blender/makesdna/intern/dna_genfile.c
branches/smoke2/source/blender/makesdna/intern/makesdna.c
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_armature.c
branches/smoke2/source/blender/makesrna/intern/rna_brush.c
branches/smoke2/source/blender/makesrna/intern/rna_color.c
branches/smoke2/source/blender/makesrna/intern/rna_constraint.c
branches/smoke2/source/blender/makesrna/intern/rna_controller.c
branches/smoke2/source/blender/makesrna/intern/rna_image_api.c
branches/smoke2/source/blender/makesrna/intern/rna_main_api.c
branches/smoke2/source/blender/makesrna/intern/rna_mesh.c
branches/smoke2/source/blender/makesrna/intern/rna_modifier.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree_types.h
branches/smoke2/source/blender/makesrna/intern/rna_rna.c
branches/smoke2/source/blender/makesrna/intern/rna_sequencer.c
branches/smoke2/source/blender/makesrna/intern/rna_sequencer_api.c
branches/smoke2/source/blender/makesrna/intern/rna_space.c
branches/smoke2/source/blender/makesrna/intern/rna_userdef.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_mask.c
branches/smoke2/source/blender/modifiers/intern/MOD_mirror.c
branches/smoke2/source/blender/modifiers/intern/MOD_remesh.c
branches/smoke2/source/blender/modifiers/intern/MOD_screw.c
branches/smoke2/source/blender/nodes/CMakeLists.txt
branches/smoke2/source/blender/nodes/NOD_composite.h
branches/smoke2/source/blender/nodes/SConscript
branches/smoke2/source/blender/nodes/composite/node_composite_tree.c
branches/smoke2/source/blender/nodes/composite/node_composite_util.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_displace.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_viewer.c
branches/smoke2/source/blender/nodes/intern/node_common.c
branches/smoke2/source/blender/nodes/intern/node_exec.c
branches/smoke2/source/blender/nodes/shader/node_shader_tree.c
branches/smoke2/source/blender/nodes/shader/node_shader_util.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/smoke2/source/blender/nodes/texture/node_texture_tree.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types.c
branches/smoke2/source/blender/python/generic/py_capi_utils.c
branches/smoke2/source/blender/python/intern/bpy_driver.c
branches/smoke2/source/blender/python/intern/bpy_interface.c
branches/smoke2/source/blender/python/intern/bpy_props.c
branches/smoke2/source/blender/python/intern/bpy_rna.c
branches/smoke2/source/blender/python/intern/bpy_rna_callback.c
branches/smoke2/source/blender/render/intern/raytrace/bvh.h
branches/smoke2/source/blender/render/intern/raytrace/rayobject.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_hint.h
branches/smoke2/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_rtbuild.h
branches/smoke2/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/smoke2/source/blender/render/intern/raytrace/reorganize.h
branches/smoke2/source/blender/render/intern/raytrace/svbvh.h
branches/smoke2/source/blender/render/intern/raytrace/vbvh.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/initrender.c
branches/smoke2/source/blender/render/intern/source/pipeline.c
branches/smoke2/source/blender/render/intern/source/pixelshading.c
branches/smoke2/source/blender/render/intern/source/rayshade.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/renderdatabase.c
branches/smoke2/source/blender/render/intern/source/shadeinput.c
branches/smoke2/source/blender/render/intern/source/shadeoutput.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/texture_ocean.c
branches/smoke2/source/blender/render/intern/source/zbuf.c
branches/smoke2/source/blender/windowmanager/WM_api.h
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_gesture.c
branches/smoke2/source/blender/windowmanager/intern/wm_jobs.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.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/GameLogic/SCA_PythonController.cpp
branches/smoke2/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/smoke2/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/smoke2/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/smoke2/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/smoke2/source/gameengine/VideoTexture/CMakeLists.txt
branches/smoke2/source/tools/GL/core.gl
branches/smoke2/source/tools/GL/extensions.gl
branches/smoke2/source/tools/GL/glreport.py
branches/smoke2/source/tools/check_style_c.py
branches/smoke2/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/smoke2/extern/bullet2/patches/
branches/smoke2/intern/elbeem/intern/globals.h
branches/smoke2/source/blender/compositor/
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/smoke2/source/blender/opencl/
branches/smoke2/source/tools/GL/agl.gl
branches/smoke2/source/tools/GL/cgl.gl
branches/smoke2/source/tools/GL/deprecated.gl
branches/smoke2/source/tools/GL/egl.gl
branches/smoke2/source/tools/GL/glX.gl
branches/smoke2/source/tools/GL/libraries.gl
branches/smoke2/source/tools/GL/wgl.gl
Removed Paths:
-------------
branches/smoke2/source/tools/GL/system.gl
Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/CMakeLists.txt 2012-05-20 19:35:49 UTC (rev 46817)
@@ -103,8 +103,8 @@
#-----------------------------------------------------------------------------
# Redirect output files
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
#-----------------------------------------------------------------------------
# Set default config options
@@ -291,8 +291,9 @@
message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
endif()
else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
- execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )
- STRING(SUBSTRING ${XCODE_VERS_BUILDNR} 6 3 XCODE_VERSION) # truncate away build-nr
+ execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
+ string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
+ unset(XCODE_VERS_BUILD_NR)
endif()
message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
@@ -837,6 +838,17 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
+
+ if(WITH_MOD_CLOTH_ELTOPO)
+ set(LAPACK ${LIBDIR}/lapack)
+ # set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
+ set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)
+ set(LAPACK_LIBRARIES
+ ${LIBDIR}/lapack/lib/libf2c.lib
+ ${LIBDIR}/lapack/lib/clapack_nowrap.lib
+ ${LIBDIR}/lapack/lib/BLAS_nowrap.lib
+ )
+ endif()
set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
@@ -1011,8 +1023,10 @@
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
if(WITH_MINGW64)
- #Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+ #We need to take care though not to have these on debug builds because they may play funky with gdb
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
@@ -1077,7 +1091,11 @@
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ if(WITH_MINGW64)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ else()
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ endif()
set(PCRE_LIBRARIES pcre)
endif()
@@ -1169,13 +1187,13 @@
endif()
if(${XCODE_VERSION} VERSION_LESS 4.3)
- SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
else()
# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
# absolute pathes are more foolproof here !
- SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
- SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
- SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+ set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
endif()
if(WITH_LIBS10.5)
@@ -1347,7 +1365,7 @@
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
+ set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
#pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)
Modified: branches/smoke2/GNUmakefile
===================================================================
--- branches/smoke2/GNUmakefile 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/GNUmakefile 2012-05-20 19:35:49 UTC (rev 46817)
@@ -216,7 +216,7 @@
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
+ PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
# -----------------------------------------------------------------------------
# Project Files
Modified: branches/smoke2/build_files/cmake/macros.cmake
===================================================================
--- branches/smoke2/build_files/cmake/macros.cmake 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/build_files/cmake/macros.cmake 2012-05-20 19:35:49 UTC (rev 46817)
@@ -214,7 +214,8 @@
${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY})
+ ${FREETYPE_LIBRARY}
+ ${LAPACK_LIBRARIES})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
Modified: branches/smoke2/build_files/cmake/packaging.cmake
===================================================================
--- branches/smoke2/build_files/cmake/packaging.cmake 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/build_files/cmake/packaging.cmake 2012-05-20 19:35:49 UTC (rev 46817)
@@ -1,5 +1,5 @@
set(PROJECT_DESCRIPTION "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT "Copyright (C) 2001-2011 Blender Foundation")
+set(PROJECT_COPYRIGHT "Copyright (C) 2001-2012 Blender Foundation")
set(PROJECT_CONTACT "foundation at blender.org")
set(PROJECT_VENDOR "Blender Foundation")
set(ORG_WEBSITE "www.blender.org")
@@ -31,7 +31,7 @@
# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
Modified: branches/smoke2/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/smoke2/build_files/package_spec/rpm/blender.spec.in 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/build_files/package_spec/rpm/blender.spec.in 2012-05-20 19:35:49 UTC (rev 46817)
@@ -1,6 +1,12 @@
# -*- rpm-spec -*-
%global __python %{__python3}
+%global blender_api @CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
Summary: @CPACK_RPM_PACKAGE_SUMMARY@
Name: @CPACK_RPM_PACKAGE_NAME@
@@ -9,13 +15,18 @@
License: @CPACK_RPM_PACKAGE_LICENSE@
Group: @CPACK_RPM_PACKAGE_GROUP@
Vendor: @CPACK_RPM_PACKAGE_VENDOR@
-Epoch: 1
+Epoch: 1
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
+Requires(post): desktop-file-utils
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+Provides: blender(ABI) = %{blender_api}
+Provides: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: blender-fonts <= 2.49a-9
+
%description
Blender is an integrated 3d suite for modelling, animation, rendering,
post-production, interactive creation and playback (games). Blender has its
@@ -40,6 +51,10 @@
fi
mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
+
+%find_lang %{name}
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -57,14 +72,15 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi || :
-%files
+%files -f blender.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
-%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
+%{_datadir}/%{name}/%{blender_api}/scripts
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/blender
-%{_mandir}/man1/blender.*
+%{_datadir}/doc/%{name}
+%{_mandir}/man1/%{name}.*
%changelog
@CPACK_RPM_SPEC_CHANGELOG@
Modified: branches/smoke2/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win64-mingw-config.py 2012-05-20 18:19:45 UTC (rev 46816)
+++ branches/smoke2/build_files/scons/config/win64-mingw-config.py 2012-05-20 19:35:49 UTC (rev 46817)
@@ -167,7 +167,7 @@
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize']
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list