Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJiri Hnidek <jiri.hnidek@tul.cz>2006-10-13 17:44:13 +0400
committerJiri Hnidek <jiri.hnidek@tul.cz>2006-10-13 17:44:13 +0400
commit1c95192e743b2635778579621019b7e177a64910 (patch)
treedc2c9793cd913ac11d51b603529440397e38bd3c /source
parentc8b06bba9c7ca9a537ac0e02f0466d7da64c60fe (diff)
- added dark-green circle behind subscribed verse node
- 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 ;-)
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/outliner.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c
index 32bb98d43f4..65b793035a9 100644
--- a/source/blender/src/outliner.c
+++ b/source/blender/src/outliner.c
@@ -2513,6 +2513,14 @@ static void outliner_draw_tree_element(SpaceOops *soops, TreeElement *te, int st
col[3]= 100;
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) {
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) {
#ifdef WITH_VERSE
+ /* draw colored circle behind verse server icon */
struct VerseServer *server = (VerseServer *)te->directdata;
if(server->flag & VERSE_CONNECTING) {
glColor4ub(255,128,64,100);
@@ -2536,6 +2545,29 @@ static void outliner_draw_tree_element(SpaceOops *soops, TreeElement *te, int st
}
#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
+ }
else {
if( tree_element_type_active(soops, te, tselem, 0) ) active= 2;
glColor4ub(220, 220, 255, 100);