diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /source/blender/makesrna/intern/rna_object_force.c | |
parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_force.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index b79dee63136..97f1985b48b 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -290,52 +290,52 @@ static char *rna_CollisionSettings_path(PointerRNA *UNUSED(ptr)) #endif } -static int rna_SoftBodySettings_use_edges_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_use_edges_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_EDGES) != 0); } -static void rna_SoftBodySettings_use_edges_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_use_edges_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_EDGES; else data->softflag &= ~OB_SB_EDGES; } -static int rna_SoftBodySettings_use_goal_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_use_goal_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_GOAL) != 0); } -static void rna_SoftBodySettings_use_goal_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_use_goal_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_GOAL; else data->softflag &= ~OB_SB_GOAL; } -static int rna_SoftBodySettings_stiff_quads_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_stiff_quads_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_QUADS) != 0); } -static void rna_SoftBodySettings_stiff_quads_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_stiff_quads_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_QUADS; else data->softflag &= ~OB_SB_QUADS; } -static int rna_SoftBodySettings_self_collision_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_self_collision_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_SELF) != 0); } -static void rna_SoftBodySettings_self_collision_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_self_collision_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_SELF; @@ -360,26 +360,26 @@ static void rna_SoftBodySettings_new_aero_set(PointerRNA *ptr, int value) data->softflag &= ~OB_SB_AERO_ANGLE; } -static int rna_SoftBodySettings_face_collision_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_face_collision_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_FACECOLL) != 0); } -static void rna_SoftBodySettings_face_collision_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_face_collision_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_FACECOLL; else data->softflag &= ~OB_SB_FACECOLL; } -static int rna_SoftBodySettings_edge_collision_get(PointerRNA *ptr) +static bool rna_SoftBodySettings_edge_collision_get(PointerRNA *ptr) { Object *data = (Object *)(ptr->id.data); return (((data->softflag) & OB_SB_EDGECOLL) != 0); } -static void rna_SoftBodySettings_edge_collision_set(PointerRNA *ptr, int value) +static void rna_SoftBodySettings_edge_collision_set(PointerRNA *ptr, bool value) { Object *data = (Object *)(ptr->id.data); if (value) data->softflag |= OB_SB_EDGECOLL; |