Merge with trunk r41701
authorMiika Hamalainen <blender@miikah.org>
Wed, 9 Nov 2011 15:46:53 +0000 (15:46 +0000)
committerMiika Hamalainen <blender@miikah.org>
Wed, 9 Nov 2011 15:46:53 +0000 (15:46 +0000)
commit1b4a54ad73c058baa59ffdc9e5f18b0b79030fb0
treea5b84d392ea14b0d760a5e24f7a8e51f203d558c
parentedec46b0a6aac18f406991b9e16228d4bd848c61
parentbc5ec4e69cf3308c2563239c0e8372b853800a78
Merge with trunk r41701
24 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/space_buttons/buttons_context.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_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/intern/MOD_dynamicpaint.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/intern/source/render_texture.c
source/blenderplayer/bad_level_call_stubs/stubs.c