Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim

Conflicts:
	intern/rigidbody/CMakeLists.txt
	release/datafiles/splash.png
	source/blender/editors/space_view3d/drawobject.c
	source/blender/makesdna/DNA_view3d_types.h

1 files changed, 42 insertions, 0 deletions

diff --git a/source/blender/bmesh/tools/bmesh_beautify.h b/source/blender/bmesh/tools/bmesh_beautify.h
new file mode 100644
index 00000000000..7cc17008b50
--- /dev/null
+++ b/source/blender/bmesh/tools/bmesh_beautify.h
@@ -0,0 +1,42 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BMESH_BEAUTIFY_H__
+#define __BMESH_BEAUTIFY_H__
+
+/** \file blender/bmesh/tools/bmesh_beautify.h
+ *  \ingroup bmesh
+ */
+
+enum {
+	VERT_RESTRICT_TAG = (1 << 0),
+};
+
+void BM_mesh_beautify_fill(BMesh *bm, BMEdge **edge_array, const int edge_array_len,
+                           const short flag, const short method,
+                           const short oflag_edge, const short oflag_face);
+
+float BM_verts_calc_rotate_beauty(const BMVert *v1, const BMVert *v2,
+                                  const BMVert *v3, const BMVert *v4,
+                                  const short flag, const short method);
+
+#endif /* __BMESH_BEAUTIFY_H__ */