[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47355] branches/smoke2: Merge from trunk r47089-r47354
Daniel Genrich
daniel.genrich at gmx.net
Sat Jun 2 23:33:40 CEST 2012
Revision: 47355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47355
Author: genscher
Date: 2012-06-02 21:33:31 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
Merge from trunk r47089-r47354
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47089
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47354
Modified Paths:
--------------
branches/smoke2/CMakeLists.txt
branches/smoke2/SConstruct
branches/smoke2/build_files/scons/config/win32-vc-config.py
branches/smoke2/build_files/scons/config/win64-vc-config.py
branches/smoke2/extern/bullet2/CMakeLists.txt
branches/smoke2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/smoke2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/smoke2/extern/bullet2/src/SConscript
branches/smoke2/intern/cycles/CMakeLists.txt
branches/smoke2/intern/cycles/SConscript
branches/smoke2/intern/cycles/blender/blender_mesh.cpp
branches/smoke2/intern/cycles/blender/blender_object.cpp
branches/smoke2/intern/cycles/blender/blender_shader.cpp
branches/smoke2/intern/cycles/blender/blender_sync.cpp
branches/smoke2/intern/cycles/device/device_cuda.cpp
branches/smoke2/intern/cycles/kernel/CMakeLists.txt
branches/smoke2/intern/cycles/kernel/SConscript
branches/smoke2/intern/cycles/kernel/kernel_bvh.h
branches/smoke2/intern/cycles/kernel/kernel_compat_cuda.h
branches/smoke2/intern/cycles/kernel/kernel_projection.h
branches/smoke2/intern/cycles/kernel/kernel_textures.h
branches/smoke2/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/smoke2/intern/cycles/kernel/svm/svm_wave.h
branches/smoke2/intern/cycles/render/graph.cpp
branches/smoke2/intern/cycles/render/object.cpp
branches/smoke2/intern/cycles/render/object.h
branches/smoke2/intern/cycles/util/util_transform.h
branches/smoke2/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/smoke2/intern/ghost/test/multitest/MultiTest.c
branches/smoke2/intern/smoke/intern/FLUID_3D.cpp
branches/smoke2/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/smoke2/release/scripts/modules/bpy/utils.py
branches/smoke2/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/smoke2/release/scripts/startup/bl_operators/object.py
branches/smoke2/release/scripts/startup/bl_operators/wm.py
branches/smoke2/release/scripts/startup/bl_ui/properties_game.py
branches/smoke2/source/blender/CMakeLists.txt
branches/smoke2/source/blender/SConscript
branches/smoke2/source/blender/blenfont/intern/blf.c
branches/smoke2/source/blender/blenfont/intern/blf_font.c
branches/smoke2/source/blender/blenkernel/BKE_action.h
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_node.h
branches/smoke2/source/blender/blenkernel/BKE_sequencer.h
branches/smoke2/source/blender/blenkernel/BKE_texture.h
branches/smoke2/source/blender/blenkernel/CMakeLists.txt
branches/smoke2/source/blender/blenkernel/intern/DerivedMesh.c
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/anim_sys.c
branches/smoke2/source/blender/blenkernel/intern/blender.c
branches/smoke2/source/blender/blenkernel/intern/bullet.c
branches/smoke2/source/blender/blenkernel/intern/bvhutils.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/collision.c
branches/smoke2/source/blender/blenkernel/intern/constraint.c
branches/smoke2/source/blender/blenkernel/intern/context.c
branches/smoke2/source/blender/blenkernel/intern/customdata.c
branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/effect.c
branches/smoke2/source/blender/blenkernel/intern/fmodifier.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/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/multires.c
branches/smoke2/source/blender/blenkernel/intern/node.c
branches/smoke2/source/blender/blenkernel/intern/object.c
branches/smoke2/source/blender/blenkernel/intern/particle.c
branches/smoke2/source/blender/blenkernel/intern/particle_system.c
branches/smoke2/source/blender/blenkernel/intern/scene.c
branches/smoke2/source/blender/blenkernel/intern/seqeffects.c
branches/smoke2/source/blender/blenkernel/intern/sequencer.c
branches/smoke2/source/blender/blenkernel/intern/smoke.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/blenlib/BLI_ghash.h
branches/smoke2/source/blender/blenlib/BLI_kdopbvh.h
branches/smoke2/source/blender/blenlib/BLI_lasso.h
branches/smoke2/source/blender/blenlib/BLI_math_base.h
branches/smoke2/source/blender/blenlib/BLI_math_color.h
branches/smoke2/source/blender/blenlib/BLI_math_geom.h
branches/smoke2/source/blender/blenlib/BLI_math_vector.h
branches/smoke2/source/blender/blenlib/BLI_path_util.h
branches/smoke2/source/blender/blenlib/BLI_utildefines.h
branches/smoke2/source/blender/blenlib/PIL_time.h
branches/smoke2/source/blender/blenlib/intern/BLI_ghash.c
branches/smoke2/source/blender/blenlib/intern/BLI_heap.c
branches/smoke2/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/smoke2/source/blender/blenlib/intern/bpath.c
branches/smoke2/source/blender/blenlib/intern/edgehash.c
branches/smoke2/source/blender/blenlib/intern/math_color.c
branches/smoke2/source/blender/blenlib/intern/math_geom.c
branches/smoke2/source/blender/blenlib/intern/math_vector.c
branches/smoke2/source/blender/blenlib/intern/noise.c
branches/smoke2/source/blender/blenlib/intern/path_util.c
branches/smoke2/source/blender/blenlib/intern/string_utf8.c
branches/smoke2/source/blender/blenlib/intern/threads.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/blenloader/intern/runtime.c
branches/smoke2/source/blender/blenloader/intern/versioning_250.c
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/operators/bmo_connect.c
branches/smoke2/source/blender/collada/SceneExporter.cpp
branches/smoke2/source/blender/compositor/CMakeLists.txt
branches/smoke2/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryProxy.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryProxy.h
branches/smoke2/source/blender/compositor/intern/COM_NodeOperation.h
branches/smoke2/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/smoke2/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/smoke2/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/smoke2/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/smoke2/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
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/drivers.c
branches/smoke2/source/blender/editors/animation/fmodifier_ui.c
branches/smoke2/source/blender/editors/animation/keyframes_edit.c
branches/smoke2/source/blender/editors/animation/keyframes_general.c
branches/smoke2/source/blender/editors/animation/keyframing.c
branches/smoke2/source/blender/editors/armature/poselib.c
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/curve/curve_ops.c
branches/smoke2/source/blender/editors/curve/editcurve.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_paint.c
branches/smoke2/source/blender/editors/include/ED_keyframing.h
branches/smoke2/source/blender/editors/include/ED_object.h
branches/smoke2/source/blender/editors/include/ED_sequencer.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_draw.c
branches/smoke2/source/blender/editors/interface/interface_handlers.c
branches/smoke2/source/blender/editors/interface/interface_intern.h
branches/smoke2/source/blender/editors/interface/interface_panel.c
branches/smoke2/source/blender/editors/interface/interface_regions.c
branches/smoke2/source/blender/editors/interface/interface_templates.c
branches/smoke2/source/blender/editors/interface/interface_widgets.c
branches/smoke2/source/blender/editors/interface/resources.c
branches/smoke2/source/blender/editors/interface/view2d.c
branches/smoke2/source/blender/editors/mesh/editmesh_add.c
branches/smoke2/source/blender/editors/mesh/mesh_ops.c
branches/smoke2/source/blender/editors/metaball/mball_ops.c
branches/smoke2/source/blender/editors/object/object_add.c
branches/smoke2/source/blender/editors/object/object_edit.c
branches/smoke2/source/blender/editors/object/object_ops.c
branches/smoke2/source/blender/editors/object/object_relations.c
branches/smoke2/source/blender/editors/physics/physics_ops.c
branches/smoke2/source/blender/editors/render/render_internal.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_image.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_vertex.c
branches/smoke2/source/blender/editors/space_action/action_edit.c
branches/smoke2/source/blender/editors/space_api/CMakeLists.txt
branches/smoke2/source/blender/editors/space_buttons/buttons_header.c
branches/smoke2/source/blender/editors/space_graph/graph_edit.c
branches/smoke2/source/blender/editors/space_image/image_buttons.c
branches/smoke2/source/blender/editors/space_image/image_intern.h
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_draw.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_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_select.c
branches/smoke2/source/blender/editors/space_node/node_templates.c
branches/smoke2/source/blender/editors/space_node/space_node.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_intern.h
branches/smoke2/source/blender/editors/space_outliner/outliner_ops.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_outliner/outliner_tree.c
branches/smoke2/source/blender/editors/space_outliner/space_outliner.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_add.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_draw.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_edit.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_intern.h
branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.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_select.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_generics.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_unwrap_ops.c
branches/smoke2/source/blender/gpu/intern/gpu_buffers.c
branches/smoke2/source/blender/imbuf/IMB_imbuf.h
branches/smoke2/source/blender/imbuf/IMB_imbuf_types.h
branches/smoke2/source/blender/imbuf/intern/anim_movie.c
branches/smoke2/source/blender/imbuf/intern/jp2.c
branches/smoke2/source/blender/imbuf/intern/jpeg.c
branches/smoke2/source/blender/imbuf/intern/targa.c
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_object_types.h
branches/smoke2/source/blender/makesdna/DNA_scene_types.h
branches/smoke2/source/blender/makesdna/DNA_sequence_types.h
branches/smoke2/source/blender/makesdna/DNA_texture_types.h
branches/smoke2/source/blender/makesdna/DNA_userdef_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/intern/makesrna.c
branches/smoke2/source/blender/makesrna/intern/rna_access.c
branches/smoke2/source/blender/makesrna/intern/rna_action.c
branches/smoke2/source/blender/makesrna/intern/rna_color.c
branches/smoke2/source/blender/makesrna/intern/rna_define.c
branches/smoke2/source/blender/makesrna/intern/rna_image_api.c
branches/smoke2/source/blender/makesrna/intern/rna_mesh.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_pose.c
branches/smoke2/source/blender/makesrna/intern/rna_scene.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_texture.c
branches/smoke2/source/blender/makesrna/intern/rna_userdef.c
branches/smoke2/source/blender/makesrna/intern/rna_wm.c
branches/smoke2/source/blender/nodes/CMakeLists.txt
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/node_composite_util.h
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_alphaOver.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_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_brightness.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_image.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_math.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_value.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_zcombine.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/node_shader_util.h
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_background.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_material.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_math.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_object_info.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_output.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_value.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/smoke2/source/blender/nodes/texture/node_texture_tree.c
branches/smoke2/source/blender/nodes/texture/node_texture_util.h
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_at.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_image.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_math.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_output.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/smoke2/source/blender/python/generic/py_capi_utils.c
branches/smoke2/source/blender/python/intern/bpy_props.c
branches/smoke2/source/blender/python/intern/bpy_rna.c
branches/smoke2/source/blender/quicktime/apple/quicktime_import.c
branches/smoke2/source/blender/render/intern/source/render_texture.c
branches/smoke2/source/blender/render/intern/source/strand.c
branches/smoke2/source/blender/windowmanager/WM_api.h
branches/smoke2/source/blender/windowmanager/intern/wm_cursors.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_operators.c
branches/smoke2/source/blender/windowmanager/intern/wm_subwindow.c
branches/smoke2/source/blender/windowmanager/intern/wm_window.c
branches/smoke2/source/blenderplayer/CMakeLists.txt
branches/smoke2/source/creator/CMakeLists.txt
branches/smoke2/source/creator/creator.c
branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/smoke2/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/smoke2/source/gameengine/Converter/BL_SkinDeformer.h
branches/smoke2/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/smoke2/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/smoke2/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/smoke2/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/smoke2/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/smoke2/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/smoke2/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/smoke2/source/gameengine/Ketsji/KX_Scene.cpp
branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/smoke2/source/gameengine/Physics/common/PHY_Pro.h
branches/smoke2/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/smoke2/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
branches/smoke2/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/smoke2/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GlareGhostOperation.h
Removed Paths:
-------------
branches/smoke2/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/smoke2/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/smoke2/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/smoke2/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/smoke2/release/plugins/
branches/smoke2/source/blender/blenkernel/BKE_plugin_types.h
branches/smoke2/source/blender/blenpluginapi/
branches/smoke2/source/blender/compositor/intern/COM_MemoryManager.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryManager.h
branches/smoke2/source/blender/compositor/intern/COM_MemoryManagerState.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryManagerState.h
branches/smoke2/source/blender/compositor/intern/COM_NodeProgram.cpp
branches/smoke2/source/blender/compositor/intern/COM_NodeProgram.h
branches/smoke2/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_LensGhostOperation.h
branches/smoke2/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_LensGlowImageOperation.h
branches/smoke2/source/blender/compositor/operations/COM_LensGlowOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_LensGlowOperation.h
branches/smoke2/source/blender/editors/space_api/space.c
branches/smoke2/source/blender/nodes/shader/nodes/node_shader_dynamic.c
Property Changed:
----------------
branches/smoke2/source/blender/editors/space_outliner/
branches/smoke2/source/tools/codereview_upload.py
Modified: branches/smoke2/CMakeLists.txt
===================================================================
--- branches/smoke2/CMakeLists.txt 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/CMakeLists.txt 2012-06-02 21:33:31 UTC (rev 47355)
@@ -237,12 +237,7 @@
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
- set(PLATFORM_DEFAULT sm_20 sm_21)
-else()
- set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
-endif()
-set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
Modified: branches/smoke2/SConstruct
===================================================================
--- branches/smoke2/SConstruct 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/SConstruct 2012-06-02 21:33:31 UTC (rev 47355)
@@ -667,42 +667,6 @@
scriptinstall.append(env.Install(dir=dir, source=source))
-#-- plugins
-pluglist = []
-plugtargetlist = []
-for tp, tn, tf in os.walk('release/plugins'):
- if '.svn' in tn:
- tn.remove('.svn')
- if '_svn' in tn:
- tn.remove('_svn')
- df = tp[8:] # remove 'release/'
- for f in tf:
- pluglist.append(os.path.join(tp, f))
- plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) )
-
-
-# header files for plugins
-pluglist.append('source/blender/blenpluginapi/documentation.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h'))
-pluglist.append('source/blender/blenpluginapi/externdef.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h'))
-pluglist.append('source/blender/blenpluginapi/floatpatch.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h'))
-pluglist.append('source/blender/blenpluginapi/iff.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h'))
-pluglist.append('source/blender/blenpluginapi/util.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.DEF')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
-
-plugininstall = []
-# plugins in blender 2.5 don't work at the moment.
-#for targetdir,srcfile in zip(plugtargetlist, pluglist):
-# td, tf = os.path.split(targetdir)
-# plugininstall.append(env.Install(dir=td, source=srcfile))
-
textlist = []
texttargetlist = []
for tp, tn, tf in os.walk('release/text'):
@@ -716,11 +680,11 @@
textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
if env['OURPLATFORM']=='darwin':
- allinstall = [blenderinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, textinstall]
elif env['OURPLATFORM']=='linux':
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, iconinstall]
else:
- allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+ allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
Modified: branches/smoke2/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win32-vc-config.py 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/build_files/scons/config/win32-vc-config.py 2012-06-02 21:33:31 UTC (rev 47355)
@@ -165,7 +165,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/smoke2/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/smoke2/build_files/scons/config/win64-vc-config.py 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/build_files/scons/config/win64-vc-config.py 2012-06-02 21:33:31 UTC (rev 47355)
@@ -162,11 +162,12 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+# No need to manually specify SSE/SSE2 on x64 systems.
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
Modified: branches/smoke2/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/smoke2/extern/bullet2/CMakeLists.txt 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/extern/bullet2/CMakeLists.txt 2012-06-02 21:33:31 UTC (rev 47355)
@@ -118,6 +118,7 @@
src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+ src/BulletDynamics/Character/btKinematicCharacterController.cpp
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -154,7 +155,6 @@
# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
# src/BulletCollision/CollisionShapes/btBox2dShape.cpp
# src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
- # src/BulletDynamics/Character/btKinematicCharacterController.cpp
# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
@@ -274,6 +274,7 @@
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
src/BulletDynamics/Character/btCharacterControllerInterface.h
+ src/BulletDynamics/Character/btKinematicCharacterController.h
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -343,7 +344,6 @@
# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
# src/BulletCollision/CollisionShapes/btBox2dShape.h
# src/BulletCollision/CollisionShapes/btConvex2dShape.h
- # src/BulletDynamics/Character/btKinematicCharacterController.h
# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
)
Modified: branches/smoke2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
===================================================================
--- branches/smoke2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2012-06-02 21:33:31 UTC (rev 47355)
@@ -339,7 +339,7 @@
///***************************************** expert/internal use only *************************
- void setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
+ void setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.5));
QuantizedNodeArray& getLeafNodeArray() { return m_quantizedLeafNodes; }
///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
void buildInternal();
Modified: branches/smoke2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
===================================================================
--- branches/smoke2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-06-02 21:33:31 UTC (rev 47355)
@@ -84,7 +84,7 @@
} else
{
///need to transform normal into worldspace
- hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
+ hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
}
btScalar dotUp = m_up.dot(hitNormalWorld);
Modified: branches/smoke2/extern/bullet2/src/SConscript
===================================================================
--- branches/smoke2/extern/bullet2/src/SConscript 2012-06-02 21:04:16 UTC (rev 47354)
+++ branches/smoke2/extern/bullet2/src/SConscript 2012-06-02 21:33:31 UTC (rev 47355)
@@ -23,7 +23,7 @@
linearmath_src = env.Glob("LinearMath/*.cpp")
-bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp")
+bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp") + env.Glob("BulletDynamics/Character/*.cpp")
collision_broadphase_src = env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
collision_dispatch_src = env.Glob("BulletCollision/CollisionDispatch/*.cpp")
Modified: branches/smoke2/intern/cycles/CMakeLists.txt
===================================================================
--- branches/smoke2/intern/cycles/CMakeLists.txt 2012-06-02 21:04:16 UTC (rev 47354)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list