diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-03-29 17:45:12 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-03-29 17:45:12 +0300 |
| commit | 245d7a08d0b735c8c47c65fefdd97db7cf88fa3e (patch) | |
| tree | 79a5124c511076a7d1dbeb0544c964984d0da627 /source/blender/blenloader/intern/readfile.c | |
| parent | 39af860e6dfadde3b27c5b49cb602bd065e6451e (diff) | |
| parent | 24d931ea585ce01bb76078c48765222dcfddd431 (diff) | |
Merge branch 'master' into object_nodes
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 60ae09d357b..a01d2b310e1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1497,8 +1497,7 @@ static void *newlibadr_us(FileData *fd, void *lib, void *adr) /* increases user { ID *id = newlibadr(fd, lib, adr); - if (id) - id->us++; + id_us_plus_no_lib(id); return id; } @@ -3309,7 +3308,7 @@ static void lib_link_camera(FileData *fd, Main *main) ca->ipo = newlibadr_us(fd, ca->id.lib, ca->ipo); // XXX deprecated - old animation system - ca->dof_ob = newlibadr_us(fd, ca->id.lib, ca->dof_ob); + ca->dof_ob = newlibadr(fd, ca->id.lib, ca->dof_ob); ca->id.tag &= ~LIB_TAG_NEED_LINK; } @@ -3838,6 +3837,7 @@ static void direct_link_texture(FileData *fd, Tex *tex) if (tex->pd->falloff_curve) { direct_link_curvemapping(fd, tex->pd->falloff_curve); } + tex->pd->point_data = NULL; /* runtime data */ } tex->vd = newdataadr(fd, tex->vd); @@ -4011,7 +4011,7 @@ static void lib_link_partdeflect(FileData *fd, ID *id, PartDeflect *pd) if (pd && pd->tex) pd->tex = newlibadr_us(fd, id->lib, pd->tex); if (pd && pd->f_source) - pd->f_source = newlibadr_us(fd, id->lib, pd->f_source); + pd->f_source = newlibadr(fd, id->lib, pd->f_source); } static void lib_link_particlesettings(FileData *fd, Main *main) @@ -4640,7 +4640,7 @@ static void lib_link_modifiers__linkModifiers( *idpoin = newlibadr(fd, ob->id.lib, *idpoin); if (*idpoin != NULL && (cd_flag & IDWALK_USER) != 0) { - (*idpoin)->us++; + id_us_plus_no_lib(*idpoin); } } static void lib_link_modifiers(FileData *fd, Object *ob) @@ -5580,7 +5580,7 @@ static void lib_link_scene(FileData *fd, Main *main) if (sce->toolsettings->sculpt) sce->toolsettings->sculpt->gravity_object = - newlibadr_us(fd, sce->id.lib, sce->toolsettings->sculpt->gravity_object); + newlibadr(fd, sce->id.lib, sce->toolsettings->sculpt->gravity_object); if (sce->toolsettings->imapaint.stencil) sce->toolsettings->imapaint.stencil = @@ -5641,7 +5641,7 @@ static void lib_link_scene(FileData *fd, Main *main) seq->sound = newlibadr(fd, sce->id.lib, seq->sound); } if (seq->sound) { - seq->sound->id.us++; + id_us_plus_no_lib((ID *)seq->sound); seq->scene_sound = BKE_sound_add_scene_sound_defaults(sce, seq); } } @@ -9586,7 +9586,7 @@ static void give_base_to_objects(Main *mainvar, Scene *scene, View3D *v3d, Libra base->flag = ob->flag; CLAMP_MIN(ob->id.us, 0); - ob->id.us += 1; + id_us_plus_no_lib((ID *)ob); ob->id.tag &= ~LIB_TAG_INDIRECT; ob->id.tag |= LIB_TAG_EXTERN; @@ -9710,7 +9710,7 @@ static void link_object_postprocess(ID *id, Scene *scene, View3D *v3d, const sho base->lay = ob->lay; base->object = ob; base->flag = ob->flag; - ob->id.us++; + id_us_plus_no_lib((ID *)ob); if (flag & FILE_AUTOSELECT) { base->flag |= SELECT; |