object_cookie_cutter - use edge keys

widgetwizard - made a mistake in last commit, works and also dosnt creash with bug.
https://projects.blender.org/tracker/index.php?func=detail&aid=5289&group_id=9&atid=125
Can others test so we can close?

Object_join was messing up object usercounts
This commit is contained in:
Campbell Barton
2006-12-26 01:45:58 +00:00
parent b27785c4df
commit 470f91b506
3 changed files with 11 additions and 16 deletions

View File

@@ -2021,11 +2021,10 @@ static PyObject *Object_join( BPy_Object * self, PyObject * args )
temp_base->lay = 1; /*1 layer on */
BLI_addhead( &temp_scene->base, temp_base ); /* finally, link new base to scene */
/*child->id.us += 1;*/ /*Would usually increase user count but in this case it's ok not to */
} else {
child->id.us -= 1; /* python object user oddness */
}
child->id.us += 1; /*Would usually increase user count but in this case it's ok not to */
//DAG_object_flush_update(temp_scene, temp_base->object, OB_RECALC_DATA);
}
}
}