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-07-02 13:03:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-02 13:03:56 +0300
commitb076b3853c99d947806e05fe2dec29ca5fa944fa (patch)
tree3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/editors/physics/rigidbody_object.c
parentad5a20efcef8114b589ff66d09166eabdc8e67ad (diff)
parentb88e51dd55c62bdc160f33f9b2ae1727a892560a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/rigidbody_object.c')
-rw-r--r--source/blender/editors/physics/rigidbody_object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c
index 6ea0212199e..56d80e232c0 100644
--- a/source/blender/editors/physics/rigidbody_object.c
+++ b/source/blender/editors/physics/rigidbody_object.c
@@ -67,7 +67,7 @@
/* ********************************************** */
/* Helper API's for RigidBody Objects Editing */
-static int ED_operator_rigidbody_active_poll(bContext *C)
+static bool ED_operator_rigidbody_active_poll(bContext *C)
{
if (ED_operator_object_active_editable(C)) {
Object *ob = ED_object_active_context(C);
@@ -77,7 +77,7 @@ static int ED_operator_rigidbody_active_poll(bContext *C)
return 0;
}
-static int ED_operator_rigidbody_add_poll(bContext *C)
+static bool ED_operator_rigidbody_add_poll(bContext *C)
{
if (ED_operator_object_active_editable(C)) {
Object *ob = ED_object_active_context(C);