kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- added dark-green circle behind subscribed verse node

Browse Source 
- added green circle behind object node shared at verse server
 - it is easier to figure out, what is shared and what isn't shared

 - color is hard coded now, but Matt can improve it ;-)
This commit is contained in:
Jiri Hnidek 2006-10-13 13:44:13 +00:00
parent c8b06bba9c
commit 1c95192e74
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/src/outliner.c
View File

@ -2513,6 +2513,14 @@ static void outliner_draw_tree_element(SpaceOops *soops, TreeElement *te, int st
col[3]= 100; col[3]= 100;
glColor4ubv(col); glColor4ubv(col);
} }
if(ob->vnode) {
if (active==0) active=2;
if (ob==OBACT)
glColor4ub(0,255,0,100);
else
glColor4ub(0,128,0,100);
}
} }
else if(G.obedit && G.obedit->data==tselem->id) { else if(G.obedit && G.obedit->data==tselem->id) {
glColor4ub(255, 255, 255, 100); glColor4ub(255, 255, 255, 100);
@ -2526,6 +2534,7 @@ static void outliner_draw_tree_element(SpaceOops *soops, TreeElement *te, int st
} }
} else if (tselem->type==ID_SS) { } else if (tselem->type==ID_SS) {
#ifdef WITH_VERSE #ifdef WITH_VERSE
/* draw colored circle behind verse server icon */
struct VerseServer *server = (VerseServer *)te->directdata; struct VerseServer *server = (VerseServer *)te->directdata;
if(server->flag & VERSE_CONNECTING) { if(server->flag & VERSE_CONNECTING) {
glColor4ub(255,128,64,100); glColor4ub(255,128,64,100);
@ -2534,6 +2543,29 @@ static void outliner_draw_tree_element(SpaceOops *soops, TreeElement *te, int st
glColor4ub(0,128,0,100); glColor4ub(0,128,0,100);
active = 2; active = 2;
} }
#endif
}
else if (tselem->type==ID_VN) {
#ifdef WITH_VERSE
struct VNode *vnode = (VNode *)te->directdata;
if(vnode->type==V_NT_OBJECT) {
if(((VObjectData*)vnode->data)->object) {
glColor4ub(0,128,0,100);
active = 2;
}
}
else if(vnode->type==V_NT_GEOMETRY) {
if(((VGeomData*)vnode->data)->mesh || ((VGeomData*)vnode->data)->editmesh) {
glColor4ub(0,128,0,100);
active = 2;
}
}
if(vnode->type==V_NT_BITMAP) {
if(((VBitmapData*)vnode->data)->image) {
glColor4ub(0,128,0,100);
active = 2;
}
}
#endif #endif
} }
else { else {