diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-22 20:35:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-22 20:35:07 +0400 |
| commit | abb49829ef6bdc7385e51a00a3e2d5402dc09155 (patch) | |
| tree | ec2e14a06da5d24fab7863ea249e899f11f3594c /source/blender/blenkernel/intern/mesh.c | |
| parent | d86864027d449114868ec531b9ccf6dd19dbe67f (diff) | |
| parent | 816377cc02fe5dd4be945c0f3d415861114b4980 (diff) | |
Manual merge of soc-2009-kazanbas branch:
* copied I/O scripts
* copied, modified rna_*_api.c and rna_*.c
I/O scripts not working yet due to slight BPY differences and RNA changes. Will fix them later.
Not merged changes:
* C unit testing integration, because it is clumsy
* scons cross-compiling, can be merged easily later
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index c92eda6d169..431543f8dbd 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -542,7 +542,8 @@ void set_mesh(Object *ob, Mesh *me) if(ob->type==OB_MESH) { old= ob->data; - old->id.us--; + if (old) + old->id.us--; ob->data= me; id_us_plus((ID *)me); } |