git.blender.org - blender-staging.git/commit

author	Campbell Barton <ideasman42@gmail.com>
	Tue, 27 Sep 2011 03:12:31 +0000 (03:12 +0000)
committer	Campbell Barton <ideasman42@gmail.com>
	Tue, 27 Sep 2011 03:12:31 +0000 (03:12 +0000)
commit	effea8c29b9862e2526f2cf64811952a2971f5d6
tree	72eb6486b146967e6533e8a18bc3735607f4ac16	tree
parent	4d1e122d7becb573fea254474b349021e5293910	commit \| diff
parent	f4dec97cef4b320c6f3ffd2ddc39d429da4fd4d5	commit \| diff

svn merge ^/trunk/blender -r40511:40587

47 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/BME_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/blender.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/key.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/particle.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/particle_system.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/intern/pbvh.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/armature/reeb.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/editors/object/object_vgroup.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/physics/particle_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/sculpt_paint/paint_image.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/drawmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_buttons.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/util/editmode_undo.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/uvedit/uvedit_parametrizer.c	diff1 \|	diff2 \|	blob \| history
source/blender/gpu/intern/gpu_buffers.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_modifier_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_mesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_modifier.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_object.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_armature.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_bevel.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_cast.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_curve.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_displace.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_hook.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_lattice.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_smooth.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_warp.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_wave.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/convertblender.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/strand.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_init_exit.c	diff1 \|	diff2 \|	blob \| history
source/blenderplayer/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history
source/gameengine/Converter/BL_BlenderDataConversion.cpp	diff1 \|	diff2 \|	blob \| history

Repository to test new patches

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/BME_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/blender.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/key.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/particle.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/particle_system.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/intern/pbvh.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/armature/reeb.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/editors/object/object_vgroup.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/physics/particle_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/sculpt_paint/paint_image.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/drawmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_buttons.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/util/editmode_undo.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/uvedit/uvedit_parametrizer.c	diff1 \|	diff2 \|	blob \| history
source/blender/gpu/intern/gpu_buffers.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_modifier_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_mesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_modifier.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_object.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_armature.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_bevel.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_cast.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_curve.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_displace.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_hook.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_lattice.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_smooth.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_warp.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_wave.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/convertblender.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/strand.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_init_exit.c	diff1 \|	diff2 \|	blob \| history
source/blenderplayer/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history
source/gameengine/Converter/BL_BlenderDataConversion.cpp	diff1 \|	diff2 \|	blob \| history