[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55368] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Mar 18 12:44:57 CET 2013
Revision: 55368
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55368
Author: campbellbarton
Date: 2013-03-18 11:44:56 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/render/intern/raytrace/rayobject_internal.h
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
trunk/blender/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-03-18 11:44:56 UTC (rev 55368)
@@ -165,7 +165,7 @@
void MEM_printmemlist(void);
/** calls the function on all allocated memory blocks. */
- void MEM_callbackmemlist(void (*func)(void*));
+ void MEM_callbackmemlist(void (*func)(void *));
/** Print statistics about memory usage */
void MEM_printmemlist_stats(void);
Modified: trunk/blender/intern/itasc/Armature.cpp
===================================================================
--- trunk/blender/intern/itasc/Armature.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/intern/itasc/Armature.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -170,7 +170,7 @@
{
if (m_qCCh >= 0) {
double* item;
- item = (double*)m_cache->getPreviousCacheItem(this, m_qCCh, ×tamp);
+ item = (double *)m_cache->getPreviousCacheItem(this, m_qCCh, ×tamp);
if (item && m_qCTs != timestamp) {
double* q = m_qKdl(0);
memcpy(q, item, m_qKdl.rows()*sizeof(double));
@@ -698,8 +698,8 @@
JointConstraint_struct* pConstraint = *it;
unsigned int nr, i;
for (i=0, nr = pConstraint->segment->second.q_nr; i<pConstraint->v_nr; i++, nr++) {
- *(double*)&pConstraint->value[i].y = m_qKdl[nr];
- *(double*)&pConstraint->value[i].ydot = m_qdotKdl[nr];
+ *(double *)&pConstraint->value[i].y = m_qKdl[nr];
+ *(double *)&pConstraint->value[i].ydot = m_qdotKdl[nr];
}
if (pConstraint->function && (pConstraint->substep || (!timestamp.reiterate && !timestamp.substep))) {
(*pConstraint->function)(timestamp, pConstraint->values, pConstraint->v_nr, pConstraint->param);
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-18 11:44:56 UTC (rev 55368)
@@ -1288,14 +1288,14 @@
fprintf(stderr, "bm_face_to_node:\n");
GHASH_ITER (gh_iter, bvh->bm_face_to_node) {
fprintf(stderr, " %d -> %d\n",
- BM_elem_index_get((BMFace*)BLI_ghashIterator_getKey(&gh_iter)),
+ BM_elem_index_get((BMFace *)BLI_ghashIterator_getKey(&gh_iter)),
GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter)));
}
fprintf(stderr, "bm_vert_to_node:\n");
GHASH_ITER (gh_iter, bvh->bm_vert_to_node) {
fprintf(stderr, " %d -> %d\n",
- BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)),
+ BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)),
GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter)));
}
@@ -1307,15 +1307,15 @@
fprintf(stderr, "node %d\n faces:\n", n);
GHASH_ITER (gh_iter, node->bm_faces)
fprintf(stderr, " %d\n",
- BM_elem_index_get((BMFace*)BLI_ghashIterator_getKey(&gh_iter)));
+ BM_elem_index_get((BMFace *)BLI_ghashIterator_getKey(&gh_iter)));
fprintf(stderr, " unique verts:\n");
GHASH_ITER (gh_iter, node->bm_unique_verts)
fprintf(stderr, " %d\n",
- BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)));
+ BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)));
fprintf(stderr, " other verts:\n");
GHASH_ITER (gh_iter, node->bm_other_verts)
fprintf(stderr, " %d\n",
- BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)));
+ BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)));
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-03-18 11:44:56 UTC (rev 55368)
@@ -756,7 +756,7 @@
BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) {
if (vptr_map) {
/* printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void *)ed->v1));*/
-/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void* )ed->v2));*/
+/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void *)ed->v2));*/
ed->v1 = BLI_ghash_lookup(vptr_map, (const void *)ed->v1);
ed->v2 = BLI_ghash_lookup(vptr_map, (const void *)ed->v2);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-03-18 11:44:56 UTC (rev 55368)
@@ -1087,7 +1087,7 @@
* Small utility functions for fast access
*
* faster alternative to:
- * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 3);
+ * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3);
*/
void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3])
{
@@ -1102,7 +1102,7 @@
/**
* faster alternative to:
- * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 4);
+ * BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 4);
*/
void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4])
{
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -184,7 +184,7 @@
ListBase *conlist = get_active_constraints(ob);
if (conlist == NULL) return;
bConstraint *con;
- for (con = (bConstraint*)conlist->first; con; con = con->next) {
+ for (con = (bConstraint *)conlist->first; con; con = con->next) {
ListBase targets = {NULL, NULL};
bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
@@ -200,7 +200,7 @@
*/
cti->get_constraint_targets(con, &targets);
if (cti) {
- for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next) {
+ for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) {
obtar = ct->tar;
find_frames(obtar, frames);
}
@@ -544,7 +544,7 @@
if (!fra.size())
return;
- BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char*)translate_id(ob_name).c_str(),
+ BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char *)translate_id(ob_name).c_str(),
"object_matrix");
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
@@ -1535,7 +1535,7 @@
{
ListBase *conlist = get_active_constraints(ob);
bConstraint *con;
- for (con = (bConstraint*)conlist->first; con; con = con->next) {
+ for (con = (bConstraint *)conlist->first; con; con = con->next) {
ListBase targets = {NULL, NULL};
bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
@@ -1544,7 +1544,7 @@
bConstraintTarget *ct;
Object *obtar;
cti->get_constraint_targets(con, &targets);
- for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next) {
+ for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) {
obtar = ct->tar;
BKE_animsys_evaluate_animdata(scene, &obtar->id, obtar->adt, ctime, ADT_RECALC_ANIM);
BKE_object_where_is_calc_time(scene, obtar, ctime);
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -674,7 +674,7 @@
if (source_ob) {
- Mesh *source_me = (Mesh*) source_ob->data;
+ Mesh *source_me = (Mesh *)source_ob->data;
//insert key to source mesh
Key *key = source_me->key = BKE_key_add((ID *)source_me);
key->type = KEY_RELATIVE;
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -352,7 +352,7 @@
source.prepareToAppendValues();
- KeyBlock * kb = (KeyBlock*)key->block.first;
+ KeyBlock *kb = (KeyBlock *)key->block.first;
//skip the basis
kb = kb->next;
for (; kb; kb = kb->next) {
@@ -381,7 +381,7 @@
source.prepareToAppendValues();
- KeyBlock * kb = (KeyBlock*)key->block.first;
+ KeyBlock *kb = (KeyBlock *)key->block.first;
//skip the basis
kb = kb->next;
for (; kb; kb = kb->next) {
@@ -399,7 +399,7 @@
// can also try the base element and param alternative
COLLADASW::BaseExtraTechnique extra;
- KeyBlock * kb = (KeyBlock*)key->block.first;
+ KeyBlock * kb = (KeyBlock *)key->block.first;
//skip the basis
kb = kb->next;
for (; kb; kb = kb->next) {
Modified: trunk/blender/source/blender/collada/GeometryExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/GeometryExporter.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/collada/GeometryExporter.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -155,7 +155,7 @@
if (this->export_settings->include_shapekeys) {
Key * key = BKE_key_from_object(ob);
if (key) {
- KeyBlock * kb = (KeyBlock*)key->block.first;
+ KeyBlock * kb = (KeyBlock *)key->block.first;
//skip the basis
kb = kb->next;
for (; kb; kb = kb->next) {
Modified: trunk/blender/source/blender/collada/SceneExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.cpp 2013-03-18 11:34:05 UTC (rev 55367)
+++ trunk/blender/source/blender/collada/SceneExporter.cpp 2013-03-18 11:44:56 UTC (rev 55368)
@@ -190,7 +190,7 @@
}
if (ob->constraints.first != NULL ) {
- bConstraint *con = (bConstraint*) ob->constraints.first;
+ bConstraint *con = (bConstraint *) ob->constraints.first;
while (con) {
std::string con_name(id_name(con));
std::string con_tag = con_name + "_constraint";
@@ -216,7 +216,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list