Commit: a04a8039f0880cd35f92853460eefd066d3d8ef8
Author: Campbell Barton
Date: Fri Jul 18 11:54:09 2014 +1000
https://developer.blender.org/rBa04a8039f0880cd35f92853460eefd066d3d8ef8
Code cleanup
===================================================================
M intern/rigidbody/rb_bullet_api.cpp
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/editors/object/object_vgroup.c
===================================================================
diff --git a/intern/rigidbody/rb_bullet_api.cpp
b/intern/rigidbody/rb_bullet_api.cpp
index f3d159d..17bb381 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -390,7 +390,7 @@ float RB_body_get_mass(rbRigidBody *object)
float value = (float)body->getInvMass();
if (value)
- value = 1.0 / value;
+ value = 1.0f / value;
return value;
}
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 8c7d6e9..98bcdfa 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -471,7 +471,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol)
/* if automatically determining dimensions, use the Object's boundbox
* - assume that all quadrics are standing upright on local z-axis
* - assume even distribution of mass around the Object's pivot
- * (i.e. Object pivot is centralised in boundbox)
+ * (i.e. Object pivot is centralized in boundbox)
* - boundbox gives full width
*/
// XXX: all dimensions are auto-determined now... later can add stored
settings for this
@@ -567,7 +567,7 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float
r_com[3])
/* if automatically determining dimensions, use the Object's boundbox
* - assume that all quadrics are standing upright on local z-axis
* - assume even distribution of mass around the Object's pivot
- * (i.e. Object pivot is centralised in boundbox)
+ * (i.e. Object pivot is centralized in boundbox)
* - boundbox gives full width
*/
// XXX: all dimensions are auto-determined now... later can add stored
settings for this
diff --git a/source/blender/bmesh/intern/bmesh_mods.c
b/source/blender/bmesh/intern/bmesh_mods.c
index c9e367d..43f33a9 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -832,7 +832,7 @@ bool BM_face_split_edgenet(
BM_ELEM_API_FLAG_ENABLE(f_new, FACE_NET);
/* add new verts to keep finding loops for
- * (verts betweem boundary and manifold edges)
*/
+ * (verts between boundary and manifold edges)
*/
l_iter = l_first = BM_FACE_FIRST_LOOP(f_new);
l_prev_is_boundary =
(bm_edge_flagged_radial_count(l_iter->prev->e) == 1);
do {
diff --git a/source/blender/editors/object/object_vgroup.c
b/source/blender/editors/object/object_vgroup.c
index 04e05f1..6897861 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -4376,8 +4376,8 @@ static int vertex_group_sort_exec(bContext *C, wmOperator
*op)
name_array = vgroup_init_remap(ob);
/*sort vgroup names*/
- switch(sort_type) {
- case SORT_TYPE_NAME:
+ switch (sort_type) {
+ case SORT_TYPE_NAME:
BLI_sortlist(&ob->defbase, vgroup_sort_name);
break;
case SORT_TYPE_BONEHIERARCHY:
@@ -4401,9 +4401,9 @@ static int vertex_group_sort_exec(bContext *C, wmOperator
*op)
void OBJECT_OT_vertex_group_sort(wmOperatorType *ot)
{
static EnumPropertyItem vgroup_sort_type[] = {
- {SORT_TYPE_NAME, "NAME", 0, "Name", ""},
- {SORT_TYPE_BONEHIERARCHY, "BONE_HIERARCHY", 0, "Bone
Hierarchy", ""},
- {0, NULL, 0, NULL, NULL}
+ {SORT_TYPE_NAME, "NAME", 0, "Name", ""},
+ {SORT_TYPE_BONEHIERARCHY, "BONE_HIERARCHY", 0, "Bone
Hierarchy", ""},
+ {0, NULL, 0, NULL, NULL}
};
ot->name = "Sort Vertex Groups";
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
