Merge with trunk r39750
authorMiika Hamalainen <blender@miikah.org>
Sun, 28 Aug 2011 16:46:40 +0000 (16:46 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sun, 28 Aug 2011 16:46:40 +0000 (16:46 +0000)
commit39b66f9ad4239865f25853eea3cbf48e4853a266
treeec51eeaba501cacc46f80a21ec6eb896a80940d2
parent0bb7ddad97fccc7f746a744760f281125482603a
parentc07bd1439a3f026b8603c52662c3e7ccc364321a
Merge with trunk r39750
14 files changed:
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/render_texture.c