[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46306] trunk/blender/source: code cleanup : function naming for BLI functions.
Campbell Barton
ideasman42 at gmail.com
Sat May 5 02:23:56 CEST 2012
Revision: 46306
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46306
Author: campbellbarton
Date: 2012-05-05 00:23:55 +0000 (Sat, 05 May 2012)
Log Message:
-----------
code cleanup: function naming for BLI functions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenlib/BLI_bitmap.h
trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
trunk/blender/source/blender/blenlib/BLI_bpath.h
trunk/blender/source/blender/blenlib/BLI_callbacks.h
trunk/blender/source/blender/blenlib/BLI_jitter.h
trunk/blender/source/blender/blenlib/BLI_scanfill.h
trunk/blender/source/blender/blenlib/BLI_uvproject.h
trunk/blender/source/blender/blenlib/BLI_voxel.h
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/callbacks.c
trunk/blender/source/blender/blenlib/intern/jitter.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/blenlib/intern/uvproject.c
trunk/blender/source/blender/blenlib/intern/voxel.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_app_handlers.c
trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -110,7 +110,7 @@
IMB_exit();
- BLI_cb_finalize();
+ BLI_callback_global_finalize();
seq_stripelem_cache_destruct();
IMB_moviecache_destruct();
@@ -173,7 +173,7 @@
{
Scene *scene;
- bpath_traverse_main(main, clean_paths_visit_cb, BPATH_TRAVERSE_SKIP_MULTIFILE, NULL);
+ BLI_bpath_traverse_main(main, clean_paths_visit_cb, BLI_BPATH_TRAVERSE_SKIP_MULTIFILE, NULL);
for (scene= main->scene.first; scene; scene= scene->id.next) {
BLI_clean(scene->r.pic);
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -432,7 +432,7 @@
totvert= 0;
nextcol= 0;
- BLI_begin_edgefill(&sf_ctx);
+ BLI_scanfill_begin(&sf_ctx);
dl= dispbase->first;
while (dl) {
@@ -449,18 +449,18 @@
while (a--) {
vlast= eve;
- eve = BLI_addfillvert(&sf_ctx, f1);
+ eve = BLI_scanfill_vert_add(&sf_ctx, f1);
totvert++;
if (vlast==NULL) v1= eve;
else {
- BLI_addfilledge(&sf_ctx, vlast, eve);
+ BLI_scanfill_edge_add(&sf_ctx, vlast, eve);
}
f1+=3;
}
if (eve!=NULL && v1!=NULL) {
- BLI_addfilledge(&sf_ctx, eve, v1);
+ BLI_scanfill_edge_add(&sf_ctx, eve, v1);
}
}
else if (colnr<dl->col) {
@@ -473,7 +473,7 @@
dl= dl->next;
}
- if (totvert && (tot= BLI_edgefill(&sf_ctx, FALSE))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
+ if (totvert && (tot= BLI_scanfill_calc(&sf_ctx, FALSE))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
if (tot) {
dlnew= MEM_callocN(sizeof(DispList), "filldisplist");
dlnew->type= DL_INDEX3;
@@ -518,7 +518,7 @@
BLI_addhead(to, dlnew);
}
- BLI_end_edgefill(&sf_ctx);
+ BLI_scanfill_end(&sf_ctx);
if (nextcol) {
/* stay at current char but fill polys with next material */
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -196,18 +196,18 @@
ScanFillFace *efa;
int totfilltri;
- BLI_begin_edgefill(&sf_ctx);
+ BLI_scanfill_begin(&sf_ctx);
/*scanfill time*/
l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
for (j=0; l; l=BM_iter_step(&liter), j++) {
/*mark order*/
BM_elem_index_set(l, j); /* set_loop */
- v = BLI_addfillvert(&sf_ctx, l->v->co);
+ v = BLI_scanfill_vert_add(&sf_ctx, l->v->co);
v->tmp.p = l;
if (lastv) {
- /* e = */ BLI_addfilledge(&sf_ctx, lastv, v);
+ /* e = */ BLI_scanfill_edge_add(&sf_ctx, lastv, v);
}
lastv = v;
@@ -215,9 +215,9 @@
}
/*complete the loop*/
- BLI_addfilledge(&sf_ctx, firstv, v);
+ BLI_scanfill_edge_add(&sf_ctx, firstv, v);
- totfilltri = BLI_edgefill_ex(&sf_ctx, FALSE, f->no);
+ totfilltri = BLI_scanfill_calc_ex(&sf_ctx, FALSE, f->no);
BLI_array_grow_items(looptris, totfilltri);
for (efa = sf_ctx.fillfacebase.first; efa; efa=efa->next) {
@@ -235,7 +235,7 @@
i += 1;
}
- BLI_end_edgefill(&sf_ctx);
+ BLI_scanfill_end(&sf_ctx);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -135,9 +135,9 @@
{
char *bpath_user_data[2]= {bmain->name, lib->filepath};
- bpath_traverse_id(bmain, id,
- bpath_relocate_visitor,
- BPATH_TRAVERSE_SKIP_MULTIFILE,
+ BLI_bpath_traverse_id(bmain, id,
+ BLI_bpath_relocate_visitor,
+ BLI_BPATH_TRAVERSE_SKIP_MULTIFILE,
bpath_user_data);
}
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -2481,24 +2481,24 @@
ml = mloop + mp->loopstart;
- BLI_begin_edgefill(&sf_ctx);
+ BLI_scanfill_begin(&sf_ctx);
firstv = NULL;
lastv = NULL;
for (j=0; j<mp->totloop; j++, ml++) {
- v = BLI_addfillvert(&sf_ctx, mvert[ml->v].co);
+ v = BLI_scanfill_vert_add(&sf_ctx, mvert[ml->v].co);
v->keyindex = mp->loopstart + j;
if (lastv)
- BLI_addfilledge(&sf_ctx, lastv, v);
+ BLI_scanfill_edge_add(&sf_ctx, lastv, v);
if (!firstv)
firstv = v;
lastv = v;
}
- BLI_addfilledge(&sf_ctx, lastv, firstv);
+ BLI_scanfill_edge_add(&sf_ctx, lastv, firstv);
- totfilltri = BLI_edgefill(&sf_ctx, FALSE);
+ totfilltri = BLI_scanfill_calc(&sf_ctx, FALSE);
if (totfilltri) {
BLI_array_grow_items(mface_to_poly_map, totfilltri);
BLI_array_grow_items(mface, totfilltri);
@@ -2531,7 +2531,7 @@
}
}
- BLI_end_edgefill(&sf_ctx);
+ BLI_scanfill_end(&sf_ctx);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-05 00:23:55 UTC (rev 46306)
@@ -1007,7 +1007,7 @@
void scene_update_tagged(Main *bmain, Scene *scene)
{
/* keep this first */
- BLI_exec_cb(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_PRE);
+ BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_PRE);
/* flush recalc flags to dependencies */
DAG_ids_flush_tagged(bmain);
@@ -1035,7 +1035,7 @@
BKE_ptcache_quick_cache_all(bmain, scene);
/* notify editors and python about recalc */
- BLI_exec_cb(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_POST);
+ BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_POST);
DAG_ids_check_recalc(bmain, scene, FALSE);
/* clear recalc flags */
@@ -1049,8 +1049,8 @@
Scene *sce_iter;
/* keep this first */
- BLI_exec_cb(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_PRE);
- BLI_exec_cb(bmain, &sce->id, BLI_CB_EVT_SCENE_UPDATE_PRE);
+ BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_PRE);
+ BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_SCENE_UPDATE_PRE);
sound_set_cfra(sce->r.cfra);
@@ -1084,8 +1084,8 @@
scene_update_tagged_recursive(bmain, sce, sce);
/* notify editors and python about recalc */
- BLI_exec_cb(bmain, &sce->id, BLI_CB_EVT_SCENE_UPDATE_POST);
- BLI_exec_cb(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_POST);
+ BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_SCENE_UPDATE_POST);
+ BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_POST);
DAG_ids_check_recalc(bmain, sce, TRUE);
Modified: trunk/blender/source/blender/blenlib/BLI_bitmap.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_bitmap.h 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenlib/BLI_bitmap.h 2012-05-05 00:23:55 UTC (rev 46306)
@@ -69,7 +69,7 @@
/* set or clear the value of a single bit at '_index' */
#define BLI_BITMAP_MODIFY(_bitmap, _index, _set) \
do { \
- if(_set) \
+ if (_set) \
BLI_BITMAP_SET(_bitmap, _index); \
else \
BLI_BITMAP_CLEAR(_bitmap, _index); \
Modified: trunk/blender/source/blender/blenlib/BLI_boxpack2d.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_boxpack2d.h 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenlib/BLI_boxpack2d.h 2012-05-05 00:23:55 UTC (rev 46306)
@@ -34,7 +34,7 @@
/* Box Packer */
-typedef struct boxPack {
+typedef struct BoxPack {
float x;
float y;
float w;
@@ -44,9 +44,9 @@
/* Verts this box uses
* (BL,TR,TL,BR) / 0,1,2,3 */
struct boxVert *v[4];
-} boxPack;
+} BoxPack;
-void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_height);
+void BLI_box_pack_2D(BoxPack *boxarray, const int len, float *tot_width, float *tot_height);
#endif
Modified: trunk/blender/source/blender/blenlib/BLI_bpath.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_bpath.h 2012-05-04 23:36:10 UTC (rev 46305)
+++ trunk/blender/source/blender/blenlib/BLI_bpath.h 2012-05-05 00:23:55 UTC (rev 46306)
@@ -43,25 +43,25 @@
* path has changed, and in that case, should write the result to pathOut. */
typedef int (*BPathVisitor)(void *userdata, char *path_dst, const char *path_src);
/* Executes 'visit' for each path associated with 'id'. */
-void bpath_traverse_id(struct Main *bmain, struct ID *id, BPathVisitor visit_cb, const int flag, void *userdata);
-void bpath_traverse_id_list(struct Main *bmain, struct ListBase *lb, BPathVisitor visit_cb, const int flag, void *userdata);
-void bpath_traverse_main(struct Main *bmain, BPathVisitor visit_cb, const int flag, void *userdata);
-int bpath_relocate_visitor(void *oldbasepath, char *path_dst, const char *path_src);
+void BLI_bpath_traverse_id(struct Main *bmain, struct ID *id, BPathVisitor visit_cb, const int flag, void *userdata);
+void BLI_bpath_traverse_id_list(struct Main *bmain, struct ListBase *lb, BPathVisitor visit_cb, const int flag, void *userdata);
+void BLI_bpath_traverse_main(struct Main *bmain, BPathVisitor visit_cb, const int flag, void *userdata);
+int BLI_bpath_relocate_visitor(void *oldbasepath, char *path_dst, const char *path_src);
-#define BPATH_TRAVERSE_ABS (1<<0) /* convert paths to absolute */
-#define BPATH_TRAVERSE_SKIP_LIBRARY (1<<2) /* skip library paths */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list