[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45059] trunk/blender/source/blender/bmesh : move some bmesh headers into intern/ since they are not used externally.

Campbell Barton ideasman42 at gmail.com
Wed Mar 21 13:08:16 CET 2012


Revision: 45059
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45059
Author:   campbellbarton
Date:     2012-03-21 12:08:16 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
move some bmesh headers into intern/ since they are not used externally.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/CMakeLists.txt
    trunk/blender/source/blender/bmesh/bmesh.h
    trunk/blender/source/blender/bmesh/bmesh_class.h
    trunk/blender/source/blender/bmesh/intern/bmesh_inline.c

Added Paths:
-----------
    trunk/blender/source/blender/bmesh/intern/bmesh_error.h
    trunk/blender/source/blender/bmesh/intern/bmesh_operator_api.h

Removed Paths:
-------------
    trunk/blender/source/blender/bmesh/bmesh_error.h
    trunk/blender/source/blender/bmesh/bmesh_operator_api.h

Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt	2012-03-21 11:31:40 UTC (rev 45058)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt	2012-03-21 12:08:16 UTC (rev 45059)
@@ -87,12 +87,13 @@
 	intern/bmesh_walkers_impl.c
 	intern/bmesh_walkers_private.h
 
+	intern/bmesh_operator_api.h
+	intern/bmesh_error.h
+
 	tools/BME_bevel.c
 
 	bmesh.h
 	bmesh_class.h
-	bmesh_error.h
-	bmesh_operator_api.h
 )
 
 if(MSVC)

Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h	2012-03-21 11:31:40 UTC (rev 45058)
+++ trunk/blender/source/blender/bmesh/bmesh.h	2012-03-21 12:08:16 UTC (rev 45059)
@@ -206,79 +206,9 @@
 
 #include "bmesh_class.h"
 
-/*forward declarations*/
-
-/* ------------------------------------------------------------------------- */
-/* bmesh_inline.c */
-
-/* stuff for dealing with header flags */
-#define BM_elem_flag_test(   ele, hflag)      _bm_elem_flag_test    (&(ele)->head, hflag)
-#define BM_elem_flag_enable( ele, hflag)      _bm_elem_flag_enable  (&(ele)->head, hflag)
-#define BM_elem_flag_disable(ele, hflag)      _bm_elem_flag_disable (&(ele)->head, hflag)
-#define BM_elem_flag_set(    ele, hflag, val) _bm_elem_flag_set     (&(ele)->head, hflag, val)
-#define BM_elem_flag_toggle( ele, hflag)      _bm_elem_flag_toggle  (&(ele)->head, hflag)
-#define BM_elem_flag_merge(  ele_a, ele_b)    _bm_elem_flag_merge   (&(ele_a)->head, &(ele_b)->head)
-
-BLI_INLINE char _bm_elem_flag_test(const BMHeader *head, const char hflag);
-BLI_INLINE void _bm_elem_flag_enable(BMHeader *head, const char hflag);
-BLI_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag);
-BLI_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val);
-BLI_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag);
-BLI_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b);
-
-/* notes on BM_elem_index_set(...) usage,
- * Set index is sometimes abused as temp storage, other times we cant be
- * sure if the index values are valid because certain operations have modified
- * the mesh structure.
- *
- * To set the elements to valid indices 'BM_mesh_elem_index_ensure' should be used
- * rather then adding inline loops, however there are cases where we still
- * set the index directly
- *
- * In an attempt to manage this, here are 3 tags Im adding to uses of
- * 'BM_elem_index_set'
- *
- * - 'set_inline'  -- since the data is already being looped over set to a
- *                    valid value inline.
- *
- * - 'set_dirty!'  -- intentionally sets the index to an invalid value,
- *                    flagging 'bm->elem_index_dirty' so we don't use it.
- *
- * - 'set_ok'      -- this is valid use since the part of the code is low level.
- *
- * - 'set_ok_invalid'  -- set to -1 on purpose since this should not be
- *                    used without a full array re-index, do this on
- *                    adding new vert/edge/faces since they may be added at
- *                    the end of the array.
- *
- * - 'set_loop'    -- currently loop index values are not used used much so
- *                    assume each case they are dirty.
- * - campbell */
-
-#define BM_elem_index_get(ele)           _bm_elem_index_get(&(ele)->head)
-#define BM_elem_index_set(ele, index)    _bm_elem_index_set(&(ele)->head, index)
-BLI_INLINE int  _bm_elem_index_get(const BMHeader *ele);
-BLI_INLINE void _bm_elem_index_set(BMHeader *ele, const int index);
-
-#ifdef USE_BMESH_HOLES
-#  define BM_FACE_FIRST_LOOP(p) (((BMLoopList *)((p)->loops.first))->first)
-#else
-#  define BM_FACE_FIRST_LOOP(p) ((p)->l_first)
-#endif
-
-/* size to use for static arrays when dealing with NGons,
- * alloc after this limit is reached.
- * this value is rather arbitrary */
-#define BM_NGON_STACK_SIZE 32
-
-/* avoid inf loop, this value is arbitrary
- * but should not error on valid cases */
-#define BM_LOOP_RADIAL_MAX 10000
-#define BM_NGON_MAX 100000
-
 /* include the rest of the API */
-#include "bmesh_operator_api.h"
-#include "bmesh_error.h"
+#include "intern/bmesh_operator_api.h"
+#include "intern/bmesh_error.h"
 
 #include "intern/bmesh_construct.h"
 #include "intern/bmesh_core.h"

Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h	2012-03-21 11:31:40 UTC (rev 45058)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h	2012-03-21 12:08:16 UTC (rev 45059)
@@ -235,4 +235,24 @@
                                      * not have functions clobber them */
 };
 
+/* defines */
+
+/*forward declarations*/
+
+#ifdef USE_BMESH_HOLES
+#  define BM_FACE_FIRST_LOOP(p) (((BMLoopList *)((p)->loops.first))->first)
+#else
+#  define BM_FACE_FIRST_LOOP(p) ((p)->l_first)
+#endif
+
+/* size to use for static arrays when dealing with NGons,
+ * alloc after this limit is reached.
+ * this value is rather arbitrary */
+#define BM_NGON_STACK_SIZE 32
+
+/* avoid inf loop, this value is arbitrary
+ * but should not error on valid cases */
+#define BM_LOOP_RADIAL_MAX 10000
+#define BM_NGON_MAX 100000
+
 #endif /* __BMESH_CLASS_H__ */

Deleted: trunk/blender/source/blender/bmesh/bmesh_error.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_error.h	2012-03-21 11:31:40 UTC (rev 45058)
+++ trunk/blender/source/blender/bmesh/bmesh_error.h	2012-03-21 12:08:16 UTC (rev 45059)
@@ -1,91 +0,0 @@
-/*
- * ***** 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): Joseph Eagar.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BMESH_ERROR_H__
-#define __BMESH_ERROR_H__
-
-/** \file blender/bmesh/bmesh_error.h
- *  \ingroup bmesh
- */
-
-/*----------- bmop error system ----------*/
-
-/* pushes an error onto the bmesh error stack.
- * if msg is null, then the default message for the errorcode is used.*/
-void BMO_error_raise(BMesh *bm, BMOperator *owner, int errcode, const char *msg);
-
-/* gets the topmost error from the stack.
- * returns error code or 0 if no error.*/
-int BMO_error_get(BMesh *bm, const char **msg, BMOperator **op);
-int BMO_error_occurred(BMesh *bm);
-
-/* same as geterror, only pops the error off the stack as well */
-int BMO_error_pop(BMesh *bm, const char **msg, BMOperator **op);
-void BMO_error_clear(BMesh *bm);
-
-/* this is meant for handling errors, like self-intersection test failures.
- * it's dangerous to handle errors in general though, so disabled for now. */
-
-/* catches an error raised by the op pointed to by catchop.
- * errorcode is either the errorcode, or BMERR_ALL for any
- * error.*/
-
-/* not yet implemented.
- * int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg);
- */
-
-#define BM_ELEM_INDEX_VALIDATE(_bm, _msg_a, _msg_b) \
-	BM_mesh_elem_index_validate(_bm, __FILE__ ":" STRINGIFY(__LINE__), __func__, _msg_a, _msg_b)
-
-/*------ error code defines -------*/
-
-/*error messages*/
-#define BMERR_SELF_INTERSECTING			1
-#define BMERR_DISSOLVEDISK_FAILED		2
-#define BMERR_CONNECTVERT_FAILED		3
-#define BMERR_WALKER_FAILED				4
-#define BMERR_DISSOLVEFACES_FAILED		5
-#define BMERR_DISSOLVEVERTS_FAILED		6
-#define BMERR_TESSELLATION				7
-#define BMERR_NONMANIFOLD				8
-#define BMERR_INVALID_SELECTION			9
-#define BMERR_MESH_ERROR				10
-
-/* BMESH_ASSERT */
-#ifdef WITH_ASSERT_ABORT
-#  define _BMESH_DUMMY_ABORT abort
-#else
-#  define _BMESH_DUMMY_ABORT() (void)0
-#endif
-
-/* this is meant to be higher level then BLI_assert(),
- * its enabled even when in Release mode*/
-#define BMESH_ASSERT(a)                                                       \
-	(void)((!(a)) ?  (                                                        \
-		(                                                                     \
-		fprintf(stderr,                                                       \
-			"BMESH_ASSERT failed: %s, %s(), %d at \'%s\'\n",                  \
-			__FILE__, __func__, __LINE__, STRINGIFY(a)),                      \
-		_BMESH_DUMMY_ABORT(),                                                 \
-		NULL)) : NULL)
-
-#endif /* __BMESH_ERROR_H__ */

Deleted: trunk/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operator_api.h	2012-03-21 11:31:40 UTC (rev 45058)
+++ trunk/blender/source/blender/bmesh/bmesh_operator_api.h	2012-03-21 12:08:16 UTC (rev 45059)
@@ -1,410 +0,0 @@
-/*
- * ***** 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): Joseph Eagar.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BMESH_OPERATOR_API_H__
-#define __BMESH_OPERATOR_API_H__
-
-/** \file blender/bmesh/bmesh_operator_api.h
- *  \ingroup bmesh
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list