griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Scene.c: added missing code to copy base to object flag

Browse Source 
Drawobject.c: added wireframe outline for selected solid objects. needs
some feedback though, at my system it is quite slow.
This commit is contained in:
Ton Roosendaal
2004-06-17 18:31:42 +00:00
parent 5fb7fbe391
commit 4861dbbe50
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/scene.c
View File

@@ -393,10 +393,13 @@ void set_scene_bg(Scene *sce)
base->object->lay= base->lay;
/* group patch... */
base->flag &= ~OB_FROMGROUP;
flag= base->object->flag & OB_FROMGROUP;
base->flag |= flag;
base->object->flag= base->flag;
base->object->ctime= -1234567.0; /* force ipo to be calculated later */
base= base->next;
}

42
source/blender/src/drawobject.c
View File

@@ -3339,6 +3339,45 @@ static int ob_from_decimator(Object *ob)
return 0;
}
/* draws wire outline */
static void drawSolidSelect(Object *ob, ListBase *lb)
{
if(ob->flag & SELECT) {
if(ob==OBACT) BIF_ThemeColor(TH_ACTIVE);
else BIF_ThemeColor(TH_SELECT);
}
else return; //BIF_ThemeColor(TH_WIRE);
glLineWidth(2.0);
glDepthMask(0);
if(ob->type==OB_MESH) drawmeshwire(ob);
else drawDispListwire(lb);
glLineWidth(1.0);
glDepthMask(1);
}
static void draw_solid_select(Object *ob)
{
Curve *cu;
switch(ob->type) {
case OB_MESH:
drawSolidSelect(ob, NULL);
break;
case OB_CURVE:
case OB_SURF:
cu= ob->data;
if(boundbox_clip(ob->obmat, cu->bb)) drawSolidSelect(ob, &cu->disp);
break;
case OB_MBALL:
drawSolidSelect(ob, &ob->disp);
break;
}
}
static void drawWireExtra(Object *ob, ListBase *lb)
{
@@ -3572,6 +3611,9 @@ void draw_object(Base *base)
}
}
else {
/* draw outline for selected solid objects */
if(dt>OB_WIRE && ob!=G.obedit && (G.f & G_BACKBUFSEL)==0) draw_solid_select(ob);
switch( ob->type) {