svn merge ^/trunk/blender -r42333:42361
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 23:02:21 +0000 (23:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 23:02:21 +0000 (23:02 +0000)
commitd74c56423517de6db8ef1a1b3a74e0b1c8fc1dc6
tree6769e6a395cfd780ba4da2559c7388f707145391
parent34c5698d2ef54e288090ec0e5c8feae639bfcd21
parent06c3d5bd09e104d070d9e6c97e4baa265094240c
svn merge ^/trunk/blender -r42333:42361
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/scanfill.c
source/blender/bmesh/intern/bmesh_interp.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/object/object_relations.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/render/intern/source/render_texture.c