Merged changes from trunk to soc-2008-mxcurioni: svn merge -r 14534:14595 https:...

[blender-staging.git] / source / blender / blenkernel / intern / object.c

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index dce7f5c5550d895a69ca1e1afd11b48623c7fa92..44709ce487d4f76c8f28b502e56335a8c7d4a2d1 100644 (file)
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1371,7 +1371,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob)
                ob->mat = MEM_dupallocN(target->mat);
                for(i=0; i<target->totcol; i++) {
                        /* dont need to run test_object_materials since we know this object is new and not used elsewhere */
-                       id_us_plus((ID *)ob->mat[i]); 
+                       id_us_plus(ob->mat[i]); 
                }
        }