Object duplicators didn't draw when not selected. Was one 'else' to many in
the code!

Also noticed that duplicators couldn't be transformed when they have Ipos,
was an improper call to do_ipo in duplicator code... also made sure the
transformation info in the object is stored/restored before duplicating.
This commit is contained in:
Ton Roosendaal
2005-11-21 11:30:53 +00:00
parent d34ab0755e
commit d3bb02013f
2 changed files with 4 additions and 3 deletions

View File

@@ -296,13 +296,14 @@ static Object *new_dupli_object(ListBase *lb, Object *ob, Object *par)
void frames_duplilist(Object *ob)
{
extern int enable_cu_speed; /* object.c */
Object *newob;
Object *newob, copyob;
int cfrao, ok;
cfrao= G.scene->r.cfra;
if(ob->parent==NULL && ob->track==NULL && ob->ipo==NULL && ob->constraints.first==NULL) return;
if(ob->transflag & OB_DUPLINOSPEED) enable_cu_speed= 0;
copyob= *ob; /* store transform info */
for(G.scene->r.cfra= ob->dupsta; G.scene->r.cfra<=ob->dupend; G.scene->r.cfra++) {
@@ -321,9 +322,9 @@ void frames_duplilist(Object *ob)
}
}
*ob= copyob; /* restore transform info */
G.scene->r.cfra= cfrao;
enable_cu_speed= 1;
do_ob_ipo(ob);
}
struct vertexDupliData {

View File

@@ -2262,7 +2262,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
G.f &= ~G_PICKSEL;
}
else if((base->flag & SELECT)==0) {
if((base->flag & SELECT)==0) {
if(base->object!=G.obedit) draw_object(base);
}
}