Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-02 06:15:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-02 06:16:09 +0300
commit2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (patch)
tree92d23413d4573fb86f8e3da97e2f0a3f8d55f68d /source/blender/blenkernel/intern/rigidbody.c
parente1b8645c6adfb925c0c16abfb0241968d58081b4 (diff)
parentc00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
-rw-r--r--source/blender/blenkernel/intern/rigidbody.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 919a0c5fa02..9ca8c834bb9 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -955,7 +955,7 @@ RigidBodyWorld *BKE_rigidbody_create_world(Scene *scene)
rbw->shared = MEM_callocN(sizeof(*rbw->shared), "RigidBodyWorld_Shared");
/* set default settings */
- rbw->effector_weights = BKE_add_effector_weights(NULL);
+ rbw->effector_weights = BKE_effector_add_weights(NULL);
rbw->ltime = PSFRA;