diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2006-12-26 04:45:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2006-12-26 04:45:58 +0300 |
| commit | 470f91b506fd19808be4aca0a292021f182e3f54 (patch) | |
| tree | 00feedbd7059f39b1298251b7f39c9ce0ae4d2df /source/blender/python/api2_2x/Object.c | |
| parent | b27785c4df37d16ae3a2f052328afbc19efc7ec1 (diff) | |
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
Diffstat (limited to 'source/blender/python/api2_2x/Object.c')
| -rw-r--r-- | source/blender/python/api2_2x/Object.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index 9d691bcdc62..d7373edbf49 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -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); + } } } |