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_world.c
parentad5a20efcef8114b589ff66d09166eabdc8e67ad (diff)
parentb88e51dd55c62bdc160f33f9b2ae1727a892560a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/rigidbody_world.c')
-rw-r--r--source/blender/editors/physics/rigidbody_world.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/rigidbody_world.c b/source/blender/editors/physics/rigidbody_world.c
index 52a20ed7cf7..da0099ba469 100644
--- a/source/blender/editors/physics/rigidbody_world.c
+++ b/source/blender/editors/physics/rigidbody_world.c
@@ -58,12 +58,12 @@
/* API */
/* check if there is an active rigid body world */
-static int ED_rigidbody_world_active_poll(bContext *C)
+static bool ED_rigidbody_world_active_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
return (scene && scene->rigidbody_world);
}
-static int ED_rigidbody_world_add_poll(bContext *C)
+static bool ED_rigidbody_world_add_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
return (scene && scene->rigidbody_world == NULL);