diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-05 16:55:30 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-05 16:55:30 +0300 |
commit | 30310a530a168a4b389df9323dc89a1ffdfdd983 (patch) | |
tree | db46ce635a1d00e78f351c6d16bd72da5b002665 | |
parent | c5488b943d32ea79f49239cbb476df12ff4f1c43 (diff) |
* make sure blender2.5 still compiles when WITH_BF_VERSE=1
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_bitmap_node.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_geometry_node.c | 26 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_method.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_node.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_object_node.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/verse_session.c | 21 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
8 files changed, 48 insertions, 47 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index c57daa92484..e262e2ee461 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1519,12 +1519,12 @@ static void vDM_drawVerts(DerivedMesh *dm) vvert = vdm->vertex_layer->dl.lb.first; - bglBegin(GL_POINTS); + //XXX bglBegin(GL_POINTS); while(vvert) { - bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); + //XXX bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); vvert = vvert->next; } - bglEnd(); + //XXX bglEnd(); } /* draw all edges of VerseFaces ... it isn't optimal, because verse diff --git a/source/blender/blenkernel/intern/verse_bitmap_node.c b/source/blender/blenkernel/intern/verse_bitmap_node.c index 5f2c48b5221..47b26b17436 100644 --- a/source/blender/blenkernel/intern/verse_bitmap_node.c +++ b/source/blender/blenkernel/intern/verse_bitmap_node.c @@ -36,7 +36,7 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" @@ -222,10 +222,10 @@ VBitmapData *create_bitmap_data() vbitmap->image = NULL; - vbitmap->post_bitmap_dimension_set = post_bitmap_dimension_set; - vbitmap->post_bitmap_layer_create = post_bitmap_layer_create; - vbitmap->post_bitmap_layer_destroy = post_bitmap_layer_destroy; - vbitmap->post_bitmap_tile_set = post_bitmap_tile_set; + //XXX vbitmap->post_bitmap_dimension_set = post_bitmap_dimension_set; + //XXX vbitmap->post_bitmap_layer_create = post_bitmap_layer_create; + //XXX vbitmap->post_bitmap_layer_destroy = post_bitmap_layer_destroy; + //XXX vbitmap->post_bitmap_tile_set = post_bitmap_tile_set; return vbitmap; } diff --git a/source/blender/blenkernel/intern/verse_geometry_node.c b/source/blender/blenkernel/intern/verse_geometry_node.c index 613d4eadbec..9feb9289afa 100644 --- a/source/blender/blenkernel/intern/verse_geometry_node.c +++ b/source/blender/blenkernel/intern/verse_geometry_node.c @@ -40,7 +40,7 @@ #include "BKE_verse.h" #include "BKE_utildefines.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "verse.h" @@ -920,8 +920,8 @@ VLayer *create_verse_layer( vlayer->flag = 0; /* set up methods */ - vlayer->post_layer_create = post_layer_create; - vlayer->post_layer_destroy = post_layer_destroy; + //XXX vlayer->post_layer_create = post_layer_create; + //XXX vlayer->post_layer_destroy = post_layer_destroy; return vlayer; } @@ -945,16 +945,16 @@ VGeomData *create_geometry_data(void) geom->hash = MEM_callocN(VEDHASHSIZE*sizeof(HashVerseEdge), "verse hashedge tab"); /* set up methods */ - geom->post_vertex_create = post_vertex_create; - geom->post_vertex_set_xyz = post_vertex_set_xyz; - geom->post_vertex_delete = post_vertex_delete; - geom->post_vertex_free_constraint = post_vertex_free_constraint; - geom->post_polygon_create = post_polygon_create; - geom->post_polygon_set_corner = post_polygon_set_corner; - geom->post_polygon_delete = post_polygon_delete; - geom->post_polygon_free_constraint = post_polygon_free_constraint; - geom->post_geometry_free_constraint = post_geometry_free_constraint; - geom->post_polygon_set_uint8 = post_polygon_set_uint8; + //XXX geom->post_vertex_create = post_vertex_create; + //XXX geom->post_vertex_set_xyz = post_vertex_set_xyz; + //XXX geom->post_vertex_delete = post_vertex_delete; + //XXX geom->post_vertex_free_constraint = post_vertex_free_constraint; + //XXX geom->post_polygon_create = post_polygon_create; + //XXX geom->post_polygon_set_corner = post_polygon_set_corner; + //XXX geom->post_polygon_delete = post_polygon_delete; + //XXX geom->post_polygon_free_constraint = post_polygon_free_constraint; + //XXX geom->post_geometry_free_constraint = post_geometry_free_constraint; + //XXX geom->post_polygon_set_uint8 = post_polygon_set_uint8; return geom; } diff --git a/source/blender/blenkernel/intern/verse_method.c b/source/blender/blenkernel/intern/verse_method.c index 42e0d45768e..62511fa012f 100644 --- a/source/blender/blenkernel/intern/verse_method.c +++ b/source/blender/blenkernel/intern/verse_method.c @@ -39,7 +39,7 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_library.h" #include "BKE_text.h" diff --git a/source/blender/blenkernel/intern/verse_node.c b/source/blender/blenkernel/intern/verse_node.c index fd5a25598d3..be2bbd1a2d5 100644 --- a/source/blender/blenkernel/intern/verse_node.c +++ b/source/blender/blenkernel/intern/verse_node.c @@ -37,7 +37,7 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" @@ -209,8 +209,8 @@ static VTagGroup *create_verse_taggroup(VNode *vnode, uint16 group_id, const cha BLI_dlist_init(&(taggroup->tags)); taggroup->queue.first = taggroup->queue.last = NULL; - taggroup->post_tag_change = post_tag_change; - taggroup->post_taggroup_create = post_taggroup_create; + //XXX taggroup->post_tag_change = post_tag_change; + //XXX taggroup->post_taggroup_create = post_taggroup_create; return taggroup; } @@ -344,9 +344,9 @@ VNode* create_verse_node(VerseSession *session, VNodeID node_id, uint8 type, VNo vnode->chat_flag = CHAT_NOTLOGGED; #endif - vnode->post_node_create = post_node_create; - vnode->post_node_destroy = post_node_destroy; - vnode->post_node_name_set = post_node_name_set; + //XXX vnode->post_node_create = post_node_create; + //XXX vnode->post_node_destroy = post_node_destroy; + //XXX vnode->post_node_name_set = post_node_name_set; return vnode; } diff --git a/source/blender/blenkernel/intern/verse_object_node.c b/source/blender/blenkernel/intern/verse_object_node.c index d8be38cd00f..e7c6cda8990 100644 --- a/source/blender/blenkernel/intern/verse_object_node.c +++ b/source/blender/blenkernel/intern/verse_object_node.c @@ -39,7 +39,7 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" #include "BKE_utildefines.h" @@ -247,8 +247,8 @@ VLink *create_verse_link( vlink->flag = 0; - vlink->post_link_set = post_link_set; - vlink->post_link_destroy = post_link_destroy; + //XXX vlink->post_link_set = post_link_set; + //XXX vlink->post_link_destroy = post_link_destroy; return vlink; } @@ -321,10 +321,10 @@ VObjectData *create_object_data(void) /* set up pointers at post callback functions */ /* obj->post_transform = post_transform;*/ - obj->post_transform_pos = post_transform_pos; - obj->post_transform_rot = post_transform_rot; - obj->post_transform_scale = post_transform_scale; - obj->post_object_free_constraint = post_object_free_constraint; + //XXX obj->post_transform_pos = post_transform_pos; + //XXX obj->post_transform_rot = post_transform_rot; + //XXX obj->post_transform_scale = post_transform_scale; + //XXX obj->post_object_free_constraint = post_object_free_constraint; return obj; } diff --git a/source/blender/blenkernel/intern/verse_session.c b/source/blender/blenkernel/intern/verse_session.c index 1226fffd929..237161117fd 100644 --- a/source/blender/blenkernel/intern/verse_session.c +++ b/source/blender/blenkernel/intern/verse_session.c @@ -39,8 +39,8 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_screen.h" -#include "BIF_verse.h" +//XXX #include "BIF_screen.h" +//XXX #include "BIF_verse.h" #include "BKE_global.h" #include "BKE_verse.h" @@ -107,7 +107,7 @@ static void add_verse_server(VMSServer *server) printf("Adding new verse server: %s at %s\n", newserver->name, newserver->ip); BLI_addtail(&server_list, newserver); - post_server_add(); + //XXX post_server_add(); } /* @@ -366,11 +366,11 @@ VerseSession *create_verse_session( session->queue.first = session->queue.last = NULL; /* set up all client dependent functions */ - session->post_connect_accept = post_connect_accept; - session->post_connect_terminated = post_connect_terminated; - session->post_connect_update = post_connect_update; + //XXX session->post_connect_accept = post_connect_accept; + //XXX session->post_connect_terminated = post_connect_terminated; + //XXX session->post_connect_update = post_connect_update; - post_server_add(); + //XXX post_server_add(); return session; } @@ -442,7 +442,7 @@ void b_verse_ms_get(void) if(cb_ping_registered==0) { /* handle ping messages (for master server) */ verse_callback_set(verse_send_ping, cb_ping, NULL); - add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + //XXX add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); cb_ping_registered++; } free_all_servers(); @@ -471,8 +471,9 @@ void b_verse_connect(char *address) BLI_addtail(&session_list, session); /* add verse handler if this is first session */ - if(session_list.first == session_list.last) - add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + if(session_list.first == session_list.last) { + //XXX add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + } } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 1666a5414e7..0351ef155d9 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -158,7 +158,7 @@ Any case: direct data is ALWAYS after the lib block #include "BKE_idprop.h" #ifdef WITH_VERSE #include "BKE_verse.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #endif #include "GEN_messaging.h" @@ -1122,7 +1122,7 @@ static void write_meshs(WriteData *wd, ListBase *idbase) struct VNode *vnode = (VNode*)mesh->vnode; if(vnode) { /* mesh has to be created from verse geometry node*/ - create_meshdata_from_geom_node(mesh, vnode); + //XXX create_meshdata_from_geom_node(mesh, vnode); /* pointer at verse node can't be stored in file */ mesh->vnode = NULL; } |