svn merge ^/trunk/blender -r41226:41227 .
[blender.git] / source / blender / blenkernel / intern / world.c
index 150bf71..5c705c5 100644 (file)
@@ -160,7 +160,9 @@ void make_local_world(World *wrld)
        
        if(wrld->id.lib==NULL) return;
        if(wrld->id.us==1) {
-               id_clear_lib_data(&bmain->world, (ID *)wrld);
+               wrld->id.lib= NULL;
+               wrld->id.flag= LIB_LOCAL;
+               new_id(NULL, (ID *)wrld, NULL);
                return;
        }
        
@@ -172,7 +174,9 @@ void make_local_world(World *wrld)
        }
 
        if(local && lib==0) {
-               id_clear_lib_data(&bmain->world, (ID *)wrld);
+               wrld->id.lib= NULL;
+               wrld->id.flag= LIB_LOCAL;
+               new_id(NULL, (ID *)wrld, NULL);
        }
        else if(local && lib) {
                World *wrldn= copy_world(wrld);