diff options
Diffstat (limited to 'source/blender/bmesh/bmesh_error.h')
| -rw-r--r-- | source/blender/bmesh/bmesh_error.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/bmesh/bmesh_error.h b/source/blender/bmesh/bmesh_error.h index 74597ee6154..50be73ee80d 100644 --- a/source/blender/bmesh/bmesh_error.h +++ b/source/blender/bmesh/bmesh_error.h @@ -27,16 +27,16 @@ /* pushes an error onto the bmesh error stack. * if msg is null, then the default message for the errorcode is used.*/ -void BMO_RaiseError(BMesh *bm, BMOperator *owner, int errcode, const char *msg); +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_GetError(BMesh *bm, const char **msg, BMOperator **op); -int BMO_HasError(BMesh *bm); +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_PopError(BMesh *bm, const char **msg, BMOperator **op); -void BMO_ClearStack(BMesh *bm); +int BMO_error_pop(BMesh *bm, const char **msg, BMOperator **op); +void BMO_error_clear(BMesh *bm); #if 0 //this is meant for handling errors, like self-intersection test failures. @@ -45,11 +45,11 @@ void BMO_ClearStack(BMesh *bm); /* catches an error raised by the op pointed to by catchop. * errorcode is either the errorcode, or BMERR_ALL for any * error.*/ -int BMO_CatchOpError(BMesh *bm, BMOperator *catchop, int errorcode, char **msg); +int BMO_error_catch_op(BMesh *bm, BMOperator *catchop, int errorcode, char **msg); #endif #define BM_ELEM_INDEX_VALIDATE(_bm, _msg_a, _msg_b) \ - BM_ElemIndex_Validate(_bm, __FILE__ ":" STRINGIFY(__LINE__), __func__, _msg_a, _msg_b) + BM_mesh_elem_index_validate(_bm, __FILE__ ":" STRINGIFY(__LINE__), __func__, _msg_a, _msg_b) /*------ error code defines -------*/ |