svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 07:56:42 +0000 (07:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 07:56:42 +0000 (07:56 +0000)
commitad1d3dd30fa5f4c33279679e3824899fd18801b8
treecef4de1e42c5a8a2a1f68719452891c19a065ab7
parent77a7ec7c61965efa9e2e82894c821fe5c937b989
parent1bdf652b89871614c38bf2146cf94522c3347e06
svn merge ^/trunk/blender -r41175:41200   --- will need to apply fix after
29 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_edgehash.h
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp