[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34198] trunk/blender: rename BKE_assert() --> BLI_assert().
Campbell Barton
ideasman42 at gmail.com
Sun Jan 9 16:12:09 CET 2011
Revision: 34198
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34198
Author: campbellbarton
Date: 2011-01-09 15:12:08 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
rename BKE_assert() --> BLI_assert().
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/python/generic/mathutils_matrix.c
trunk/blender/source/blender/python/generic/mathutils_quat.c
trunk/blender/source/blender/python/generic/mathutils_vector.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/CMakeLists.txt 2011-01-09 15:12:08 UTC (rev 34198)
@@ -129,7 +129,7 @@
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
-option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BKE_assert()" OFF)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
if(APPLE)
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -2452,7 +2452,7 @@
}
}
else {
- BKE_assert(!"invalid flag for this 'idtype'");
+ BLI_assert(!"invalid flag for this 'idtype'");
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -552,7 +552,7 @@
break;
default:
- BKE_assert(!"invalid 'key->from' ID type");
+ BLI_assert(!"invalid 'key->from' ID type");
return FALSE;
}
@@ -641,7 +641,7 @@
/* should never happen */
if(freek1) MEM_freeN(freek1);
if(freekref) MEM_freeN(freekref);
- BKE_assert(!"invalid 'cp[1]'");
+ BLI_assert(!"invalid 'cp[1]'");
return;
}
@@ -777,7 +777,7 @@
/* should never happen */
if(freefrom) MEM_freeN(freefrom);
if(freereffrom) MEM_freeN(freereffrom);
- BKE_assert(!"invalid 'cp[1]'");
+ BLI_assert(!"invalid 'cp[1]'");
return;
}
@@ -944,7 +944,7 @@
if(freek2) MEM_freeN(freek2);
if(freek3) MEM_freeN(freek3);
if(freek4) MEM_freeN(freek4);
- BKE_assert(!"invalid 'cp[1]'");
+ BLI_assert(!"invalid 'cp[1]'");
return;
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -2552,7 +2552,7 @@
{
#if 0 // XXX, comment for 2.56a release, background wont set 'scene->customdata_mask'
EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
- BKE_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
+ BLI_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
if(em) {
makeDerivedMesh(scene, ob, em, scene->customdata_mask); /* was CD_MASK_BAREMESH */
BKE_mesh_end_editmesh(ob->data, em);
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-01-09 15:12:08 UTC (rev 34198)
@@ -181,7 +181,7 @@
#endif
-/* BKE_assert(), default only to print
+/* BLI_assert(), default only to print
* for aborting need to define WITH_ASSERT_ABORT
*/
#if !defined NDEBUG
@@ -191,28 +191,28 @@
# define _dummy_abort() (void)0
# endif
# ifdef __GNUC__ /* just want to check if __func__ is available */
-# define BKE_assert(a) \
+# define BLI_assert(a) \
do { \
if (0 == (a)) { \
fprintf(stderr, \
- "BKE_assert failed: %s, %s(), %d at \'%s\'\n", \
+ "BLI_assert failed: %s, %s(), %d at \'%s\'\n", \
__FILE__, __func__, __LINE__, STRINGIFY(a)); \
_dummy_abort(); \
} \
} while (0)
# else
-# define BKE_assert(a) \
+# define BLI_assert(a) \
do { \
if (0 == (a)) { \
fprintf(stderr, \
- "BKE_assert failed: %s, %d at \'%s\'\n", \
+ "BLI_assert failed: %s, %d at \'%s\'\n", \
__FILE__, __LINE__, STRINGIFY(a)); \
_dummy_abort(); \
} \
} while (0)
# endif
#else
-# define BKE_assert(a) (void)0
+# define BLI_assert(a) (void)0
#endif
#endif // BLI_UTILDEFINES_H
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -851,7 +851,7 @@
/* sanity check */
if(w<=0 || h<=0 || w>2000 || h>2000) {
printf("icon_draw_rect: icons are %i x %i pixels?\n", w, h);
- BKE_assert(!"invalid icon size");
+ BLI_assert(!"invalid icon size");
return;
}
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/editors/interface/resources.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -981,7 +981,7 @@
dst_col[2]= src_col[2]>209?255:src_col[2]+46;
break;
default:
- BKE_assert(!"invalid axis arg");
+ BLI_assert(!"invalid axis arg");
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -734,7 +734,7 @@
col[2]= 220;
break;
default:
- BKE_assert(!"invalid axis arg");
+ BLI_assert(!"invalid axis arg");
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -3348,7 +3348,7 @@
IDProperty *iter;
int i;
- BKE_assert(haystack->type == IDP_GROUP);
+ BLI_assert(haystack->type == IDP_GROUP);
link.up= parent_link;
link.name= NULL;
@@ -3408,7 +3408,7 @@
IDProperty *haystack;
IDProperty *needle;
- BKE_assert(ptr->id.data != NULL);
+ BLI_assert(ptr->id.data != NULL);
RNA_id_pointer_create(ptr->id.data, &id_ptr);
haystack= RNA_struct_idprops(&id_ptr, FALSE);
Modified: trunk/blender/source/blender/python/generic/mathutils_matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -1516,7 +1516,7 @@
}
}
else {
- BKE_assert(!"internal error");
+ BLI_assert(!"internal error");
}
PyErr_Format(PyExc_TypeError, "Matrix multiplication: not supported between '%.200s' and '%.200s' types", Py_TYPE(m1)->tp_name, Py_TYPE(m2)->tp_name);
Modified: trunk/blender/source/blender/python/generic/mathutils_quat.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_quat.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/python/generic/mathutils_quat.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -684,7 +684,7 @@
}
}
else {
- BKE_assert(!"internal error");
+ BLI_assert(!"internal error");
}
PyErr_Format(PyExc_TypeError, "Quaternion multiplication: not supported between '%.200s' and '%.200s' types", Py_TYPE(q1)->tp_name, Py_TYPE(q2)->tp_name);
Modified: trunk/blender/source/blender/python/generic/mathutils_vector.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_vector.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/python/generic/mathutils_vector.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -1129,7 +1129,7 @@
}
}
else {
- BKE_assert(!"internal error");
+ BLI_assert(!"internal error");
}
PyErr_Format(PyExc_TypeError, "Vector multiplication: not supported between '%.200s' and '%.200s' types", Py_TYPE(v1)->tp_name, Py_TYPE(v2)->tp_name);
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -269,7 +269,7 @@
Py_DECREF(mod);
}
else {
- BKE_assert(!"unable to load 'imp' module.");
+ BLI_assert(!"unable to load 'imp' module.");
}
}
@@ -319,7 +319,7 @@
PyObject *py_dict= NULL, *py_result= NULL;
PyGILState_STATE gilstate;
- BKE_assert(fn || text);
+ BLI_assert(fn || text);
if (fn==NULL && text==NULL) {
return 0;
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2011-01-09 15:09:18 UTC (rev 34197)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2011-01-09 15:12:08 UTC (rev 34198)
@@ -75,7 +75,7 @@
else pyname= "<UNKNOWN>";
/* make a nice string error */
- BKE_assert(idtype != NULL);
+ BLI_assert(idtype != NULL);
PyErr_Format(PyExc_RuntimeError, "Writing to ID classes in this context is not allowed: %.200s, %.200s datablock, error setting %.200s.%.200s", id->name+2, idtype, RNA_struct_identifier(ptr->type), pyname);
return TRUE;
@@ -1572,7 +1572,7 @@
break;
}
default:
- BKE_assert(!"Invalid array type");
+ BLI_assert(!"Invalid array type");
PyErr_SetString(PyExc_TypeError, "not an array type");
Py_DECREF(tuple);
@@ -2779,7 +2779,7 @@
break;
default:
/* should never happen */
- BKE_assert(!"Invalid context type");
+ BLI_assert(!"Invalid context type");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list