← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/bmesh/intern/bmesh_error.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/bmesh/intern/bmesh_error.h
23
23
#ifndef __BMESH_ERROR_H__
24
24
#define __BMESH_ERROR_H__
25
25
 
26
 
/** \file blender/bmesh/bmesh_error.h
 
26
/** \file blender/bmesh/intern/bmesh_error.h
27
27
 *  \ingroup bmesh
28
28
 */
29
29
 
35
35
 
36
36
/* gets the topmost error from the stack.
37
37
 * returns error code or 0 if no error.*/
38
 
int BMO_error_get(BMesh *bm, const char **msg, BMOperator **op);
39
 
int BMO_error_occurred(BMesh *bm);
 
38
int  BMO_error_get(BMesh *bm, const char **msg, BMOperator **op);
 
39
bool BMO_error_occurred(BMesh *bm);
40
40
 
41
41
/* same as geterror, only pops the error off the stack as well */
42
 
int BMO_error_pop(BMesh *bm, const char **msg, BMOperator **op);
 
42
int  BMO_error_pop(BMesh *bm, const char **msg, BMOperator **op);
43
43
void BMO_error_clear(BMesh *bm);
44
44
 
45
45
/* this is meant for handling errors, like self-intersection test failures.
69
69
#define BMERR_NONMANIFOLD                               8
70
70
#define BMERR_INVALID_SELECTION                 9
71
71
#define BMERR_MESH_ERROR                                10
 
72
#define BMERR_CONVEX_HULL_FAILED                11
72
73
 
73
74
/* BMESH_ASSERT */
74
75
#ifdef WITH_ASSERT_ABORT
83
84
        (void)((!(a)) ?  (                                                        \
84
85
                (                                                                     \
85
86
                fprintf(stderr,                                                       \
86
 
                        "BMESH_ASSERT failed: %s, %s(), %d at \'%s\'\n",                  \
87
 
                        __FILE__, __func__, __LINE__, STRINGIFY(a)),                      \
 
87
                        "BMESH_ASSERT failed: %s, %s(), %d at \'%s\'\n",              \
 
88
                        __FILE__, __func__, __LINE__, STRINGIFY(a)),                  \
88
89
                _BMESH_DUMMY_ABORT(),                                                 \
89
90
                NULL)) : NULL)
90
91