[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56082] trunk/blender/source/blender/ blenkernel/intern: missed moving BKE_editmesh_from_object in previous commit.

Campbell Barton ideasman42 at gmail.com
Tue Apr 16 08:27:25 CEST 2013


Revision: 56082
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56082
Author:   campbellbarton
Date:     2013-04-16 06:27:21 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
missed moving BKE_editmesh_from_object in previous commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/editmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-04-16 05:59:48 UTC (rev 56081)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-04-16 06:27:21 UTC (rev 56082)
@@ -49,7 +49,6 @@
 #include "BKE_mesh.h"
 #include "BKE_editmesh.h"
 
-
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 
@@ -1531,21 +1530,3 @@
 
 	return (DerivedMesh *)bmdm;
 }
-
-/**
- * \brief Return the BMEditMesh for a given object
- *
- * \note this function assumes this is a mesh object,
- * don't add NULL data check here. caller must do that
- */
-BMEditMesh *BKE_editmesh_from_object(Object *ob)
-{
-	BLI_assert(ob->type == OB_MESH);
-	/* sanity check */
-#ifndef NDEBUG
-	if (((Mesh *)ob->data)->edit_btmesh) {
-		BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob);
-	}
-#endif
-	return ((Mesh *)ob->data)->edit_btmesh;
-}

Modified: trunk/blender/source/blender/blenkernel/intern/editmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh.c	2013-04-16 05:59:48 UTC (rev 56081)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh.c	2013-04-16 06:27:21 UTC (rev 56082)
@@ -29,14 +29,17 @@
  *  \ingroup bke
  */
 
-#include "BLI_math.h"
+#include "MEM_guardedalloc.h"
 
-#include "BKE_cdderivedmesh.h"
+#include "DNA_listBase.h"
+#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 
-#include "MEM_guardedalloc.h"
+#include "BLI_math.h"
+#include "BLI_scanfill.h"
 
 #include "BKE_editmesh.h"
-#include "BLI_scanfill.h"
+#include "BKE_cdderivedmesh.h"
 
 
 BMEditMesh *BKE_editmesh_create(BMesh *bm, const bool do_tessellate)
@@ -77,6 +80,25 @@
 	return em_copy;
 }
 
+/**
+ * \brief Return the BMEditMesh for a given object
+ *
+ * \note this function assumes this is a mesh object,
+ * don't add NULL data check here. caller must do that
+ */
+BMEditMesh *BKE_editmesh_from_object(Object *ob)
+{
+	BLI_assert(ob->type == OB_MESH);
+	/* sanity check */
+#ifndef NDEBUG
+	if (((Mesh *)ob->data)->edit_btmesh) {
+		BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob);
+	}
+#endif
+	return ((Mesh *)ob->data)->edit_btmesh;
+}
+
+
 static void editmesh_tessface_calc_intern(BMEditMesh *em)
 {
 	/* use this to avoid locking pthread for _every_ polygon




More information about the Bf-blender-cvs mailing list