diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:15:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:16:09 +0300 |
| commit | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (patch) | |
| tree | 92d23413d4573fb86f8e3da97e2f0a3f8d55f68d /source/blender/makesrna | |
| parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
| parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index e2cce51fdcd..8506ff5bbd9 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -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); } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 4e9b738bfbd..e5bd55f041c 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1200,7 +1200,7 @@ static PointerRNA rna_Particle_field1_get(PointerRNA *ptr) /* weak */ if (!part->pd) - part->pd = object_add_collision_fields(0); + part->pd = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, part->pd); } @@ -1211,7 +1211,7 @@ static PointerRNA rna_Particle_field2_get(PointerRNA *ptr) /* weak */ if (!part->pd2) - part->pd2 = object_add_collision_fields(0); + part->pd2 = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, part->pd2); } |