Merging r59136 through r59152 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Aug 2013 08:23:16 +0000 (08:23 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Aug 2013 08:23:16 +0000 (08:23 +0000)
1  2 
intern/guardedalloc/intern/mallocn.c
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/intern/readfile.c

Simple merge
Simple merge
index cb6308b70618cd771be089f6996c7e0133edf19a,c23b4ac4408bf79dd4409983c42bafa6fa41215b..f3dc64a72796f1fdc6051a40db87c3f954107919
@@@ -1217,10 -1290,8 +1290,10 @@@ int object_remove_material_slot(Object 
  
        /* check indices from mesh */
        if (ELEM4(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
-               data_delete_material_index_id((ID *)ob->data, actcol - 1);
+               material_data_index_remove_id((ID *)ob->data, actcol - 1);
 -              BKE_displist_free(&ob->disp);
 +              if (ob->curve_cache) {
 +                      BKE_displist_free(&ob->curve_cache->disp);
 +              }
        }
  
        return TRUE;