svn merge ^/trunk/blender -r42095:42116
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 Nov 2011 05:33:22 +0000 (05:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 Nov 2011 05:33:22 +0000 (05:33 +0000)
commitf28fd56f8f0d539e043924343683885ebc293d9f
treef9db2509e7239a5872c420bfd4a08855388fa27b
parentb6aa3073685f3f72b240cf6b82a93678316adba7
parentdf22957bfce70b704b6b93958814c1ca8b2211f5
svn merge ^/trunk/blender -r42095:42116
23 files changed:
release/scripts/startup/bl_operators/uvcalc_lightmap.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/mesh/mesh_data.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/render/intern/source/render_texture.c
source/creator/CMakeLists.txt
source/creator/creator.c