diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-20 10:35:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-20 10:35:28 +0400 |
commit | 203c6effd57cdf3ed3b21ed74f80e0a5bc6441a3 (patch) | |
tree | 1f66faf7e90ef6fd49babdf2df0bc0cf7e086511 /source/blender/makesrna/intern/rna_rigidbody.c | |
parent | 24b43043341ee35ac31c2f2005732073f6e8c0c4 (diff) |
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna.
also set_source_files_properties() wasn't working for rna_*_gen.c files,
set dna.c and generated data files with generated property too.
Diffstat (limited to 'source/blender/makesrna/intern/rna_rigidbody.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_rigidbody.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index b1f704551e0..cb27261c7bf 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -96,14 +96,14 @@ EnumPropertyItem rigidbody_constraint_type_items[] = { /* ******************************** */ -static void rna_RigidBodyWorld_reset(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_RigidBodyWorld_reset(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { RigidBodyWorld *rbw = (RigidBodyWorld *)ptr->data; BKE_rigidbody_cache_reset(rbw); } -static char *rna_RigidBodyWorld_path(PointerRNA *ptr) +static char *rna_RigidBodyWorld_path(PointerRNA *UNUSED(ptr)) { return BLI_sprintfN("rigidbody_world"); } @@ -136,14 +136,14 @@ static void rna_RigidBodyWorld_split_impulse_set(PointerRNA *ptr, int value) /* ******************************** */ -static void rna_RigidBodyOb_reset(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_RigidBodyOb_reset(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr)) { RigidBodyWorld *rbw = scene->rigidbody_world; BKE_rigidbody_cache_reset(rbw); } -static void rna_RigidBodyOb_shape_reset(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_RigidBodyOb_shape_reset(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr) { RigidBodyWorld *rbw = scene->rigidbody_world; RigidBodyOb *rbo = (RigidBodyOb *)ptr->data; @@ -153,7 +153,7 @@ static void rna_RigidBodyOb_shape_reset(Main *bmain, Scene *scene, PointerRNA *p rbo->flag |= RBO_FLAG_NEEDS_RESHAPE; } -static char *rna_RigidBodyOb_path(PointerRNA *ptr) +static char *rna_RigidBodyOb_path(PointerRNA *UNUSED(ptr)) { /* NOTE: this hardcoded path should work as long as only Objects have this */ return BLI_sprintfN("rigid_body"); @@ -335,7 +335,7 @@ static void rna_RigidBodyOb_angular_damping_set(PointerRNA *ptr, float value) #endif } -static char *rna_RigidBodyCon_path(PointerRNA *ptr) +static char *rna_RigidBodyCon_path(PointerRNA *UNUSED(ptr)) { /* NOTE: this hardcoded path should work as long as only Objects have this */ return BLI_sprintfN("rigid_body_constraint"); @@ -596,13 +596,17 @@ static void rna_RigidBodyCon_motor_ang_target_velocity_set(PointerRNA *ptr, floa } /* Sweep test */ -static void rna_RigidBodyWorld_convex_sweep_test(RigidBodyWorld *rbw, ReportList *reports, Object *object, float ray_start[3], float ray_end[3], float r_location[3], float r_hitpoint[3], float r_normal[3], int *r_hit) +static void rna_RigidBodyWorld_convex_sweep_test( + RigidBodyWorld *rbw, ReportList *reports, + Object *object, float ray_start[3], float ray_end[3], + float r_location[3], float r_hitpoint[3], float r_normal[3], int *r_hit) { #ifdef WITH_BULLET RigidBodyOb *rob = object->rigidbody_object; if (rbw->physics_world != NULL && rob->physics_object != NULL) { - RB_world_convex_sweep_test(rbw->physics_world, rob->physics_object, ray_start, ray_end, r_location, r_hitpoint, r_normal, r_hit); + RB_world_convex_sweep_test(rbw->physics_world, rob->physics_object, ray_start, ray_end, + r_location, r_hitpoint, r_normal, r_hit); if (*r_hit == -2) { BKE_report(reports, RPT_ERROR, "A non convex collision shape was passed to the function, use only convex collision shapes"); @@ -612,6 +616,9 @@ static void rna_RigidBodyWorld_convex_sweep_test(RigidBodyWorld *rbw, ReportList *r_hit = -1; BKE_report(reports, RPT_ERROR, "Rigidbody world was not properly initialized, need to step the simulation first"); } +#else + (void)rbw, (void)reports, (void)object, (void)ray_start, (void)ray_end; + (void)r_location, (void)r_hitpoint, (void)r_normal, (void)r_hit; #endif } |