Merge with trunk r41342
authorMiika Hamalainen <blender@miikah.org>
Fri, 28 Oct 2011 17:00:53 +0000 (17:00 +0000)
committerMiika Hamalainen <blender@miikah.org>
Fri, 28 Oct 2011 17:00:53 +0000 (17:00 +0000)
commit46ae692710467d3622f58e0c5ce371674a6a7d9b
treeebd27a8cc3adad65343a6a8d3d22ce02cad24db8
parentfae903e263fd11d788a4e55900ff25f4fc8b26db
parent7627a742ab6e630522186b04a71fa40533d87db2
Merge with trunk r41342
71 files changed:
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
release/datafiles/blender_icons.png
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/properties_particle.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/BLI_kdtree.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/blender_icons.png.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/UI_icons.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_util.h
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/node_shader_util.h
source/blender/nodes/shader/nodes/node_shader_geom.c
source/blender/render/extern/include/RE_render_ext.h
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/pointdensity.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/include/voxeldata.h
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/volumetric.c
source/blender/render/intern/source/voxeldata.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp