Merging r41597 through r41607 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / object.c
index 07e199c1535a38edc703a9cae4b6f44ad4063103..45bd8f095a43c46dc2185e83fcd6ed6308f409dd 100644 (file)
@@ -1085,7 +1085,7 @@ Object *copy_object(Object *ob)
        ModifierData *md;
        int a;
 
-       obn= copy_libblock(ob);
+       obn= copy_libblock(&ob->id);
        
        if(ob->totcol) {
                obn->mat= MEM_dupallocN(ob->mat);