Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / rna_object.c
index e2cce51fdcd770229abf4fa8ec548463039d4702..8506ff5bbd945c5fa1d664904be4baefc1f64ca6 100644 (file)
@@ -1161,7 +1161,7 @@ static PointerRNA rna_Object_field_get(PointerRNA *ptr)
 
        /* weak */
        if (!ob->pd)
-               ob->pd = object_add_collision_fields(0);
+               ob->pd = BKE_partdeflect_new(0);
 
        return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, ob->pd);
 }
@@ -1175,7 +1175,7 @@ static PointerRNA rna_Object_collision_get(PointerRNA *ptr)
 
        /* weak */
        if (!ob->pd)
-               ob->pd = object_add_collision_fields(0);
+               ob->pd = BKE_partdeflect_new(0);
 
        return rna_pointer_inherit_refine(ptr, &RNA_CollisionSettings, ob->pd);
 }