sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

this missed merging from trunk somehow (mesh make local edits)

Browse Source
This commit is contained in:
Campbell Barton 2011-12-28 22:47:55 +00:00
parent 59457e0184
commit 948a76c8d0
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenkernel/intern/mesh.c
View File

@ -590,7 +590,7 @@ void make_local_mesh(Mesh *me)
{
Main *bmain= G.main;
Object *ob;
int local=0, lib=0;
int is_local= FALSE, is_lib= FALSE;
/* - only lib users: do nothing
* - only local users: set flag
@ -599,32 +599,28 @@ void make_local_mesh(Mesh *me)
if(me->id.lib==NULL) return;
if(me->id.us==1) {
me->id.lib= NULL;
me->id.flag= LIB_LOCAL;
new_id(&bmain->mesh, (ID *)me, NULL);
id_clear_lib_data(bmain, &me->id);
expand_local_mesh(me);
return;
}
for(ob= bmain->object.first; ob && ELEM(0, lib, local); ob= ob->id.next) {
for(ob= bmain->object.first; ob && ELEM(0, is_lib, is_local); ob= ob->id.next) {
if(me == ob->data) {
if(ob->id.lib) lib= 1;
else local= 1;
if(ob->id.lib) is_lib= TRUE;
else is_local= TRUE;
}
}
if(local && lib==0) {
me->id.lib= NULL;
me->id.flag= LIB_LOCAL;
new_id(&bmain->mesh, (ID *)me, NULL);
if(is_local && is_lib == FALSE) {
id_clear_lib_data(bmain, &me->id);
expand_local_mesh(me);
}
else if(local && lib) {
else if(is_local && is_lib) {
Mesh *me_new= copy_mesh(me);
me_new->id.us= 0;
/* Remap paths of new ID using old library as base. */
BKE_id_lib_local_paths(bmain, me->id.lib, &me_new->id);
for(ob= bmain->object.first; ob; ob= ob->id.next) {