[Bf-blender-cvs] [88e5705] master: Code Cleanup: remove unused m_contactProcessingThreshold
Campbell Barton
noreply at git.blender.org
Thu May 8 06:23:36 CEST 2014
Commit: 88e5705a3fe04cf9e83baa4007c06e35d19156ae
Author: Campbell Barton
Date: Thu May 8 14:22:47 2014 +1000
https://developer.blender.org/rB88e5705a3fe04cf9e83baa4007c06e35d19156ae
Code Cleanup: remove unused m_contactProcessingThreshold
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/makesdna/DNA_object_types.h
M source/gameengine/Physics/Bullet/CcdPhysicsController.h
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index fa61b09..d99086a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1002,8 +1002,6 @@ Object *BKE_object_add_only_object(Main *bmain, int type, const char *name)
ob->margin = 0.04f;
ob->init_state = 1;
ob->state = 1;
- /* ob->pad3 == Contact Processing Threshold */
- ob->m_contactProcessingThreshold = 1.0f;
ob->obstacleRad = 1.0f;
ob->step_height = 0.15f;
ob->jump_speed = 10.0f;
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index bf687dc..572c6d0 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -3570,8 +3570,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
Object *ob;
World *wrld;
for (ob = main->object.first; ob; ob = ob->id.next) {
- /* pad3 is used for m_contactProcessingThreshold */
- ob->m_contactProcessingThreshold = 1.0f;
if (ob->parent) {
/* check if top parent has compound shape set and if yes, set this object
* to compound shaper as well (was the behavior before, now it's optional) */
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index b43ddf2..c558d81 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -122,6 +122,8 @@ bool ED_texture_context_check_linestyle(const bContext *C)
}
}
}
+#else
+ (void)C;
#endif
return false;
}
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 60de5e1..811c33b 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -190,6 +190,8 @@ typedef struct Object {
int dupon, dupoff, dupsta, dupend;
+ int pad;
+
/* during realtime */
/* note that inertia is only called inertia for historical reasons
@@ -210,7 +212,6 @@ typedef struct Object {
float margin;
float max_vel; /* clamp the maximum velocity 0.0 is disabled */
float min_vel; /* clamp the minimum velocity 0.0 is disabled */
- float m_contactProcessingThreshold;
float obstacleRad;
/* "Character" physics properties */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index d8bb0d0..25a8f03 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -287,8 +287,8 @@ struct CcdConstructionInfo
m_fh_spring(0.f),
m_fh_damping(0.f),
m_fh_distance(1.f),
- m_fh_normal(false),
- m_contactProcessingThreshold(1e10f)
+ m_fh_normal(false)
+ // m_contactProcessingThreshold(1e10f)
{
}
@@ -390,8 +390,7 @@ struct CcdConstructionInfo
///however, rigid body stacking is more stable when positive contacts are still passed into the constraint solver
///this might sometimes lead to collisions with 'internal edges' such as a sliding character controller
///so disable/set m_contactProcessingThreshold to zero for sliding characters etc.
- float m_contactProcessingThreshold;///< Process contacts with positive distance in range [0..INF]
-
+ // float m_contactProcessingThreshold;///< Process contacts with positive distance in range [0..INF]
};
class btRigidBody;
More information about the Bf-blender-cvs
mailing list