style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 11:44:56 +0000 (11:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Mar 2013 11:44:56 +0000 (11:44 +0000)
28 files changed:
intern/guardedalloc/MEM_guardedalloc.h
intern/itasc/Armature.cpp
source/blender/blenkernel/intern/pbvh_bmesh.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/collada/AnimationExporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ControllerExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/SceneExporter.cpp
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/quicktime/apple/qtkit_export.m
source/blender/render/intern/raytrace/rayobject_internal.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/renderdatabase.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/BL_ArmatureConstraint.cpp
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_DeformableGameObject.cpp
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Ketsji/BL_Action.cpp
source/gameengine/Ketsji/KX_ArmatureSensor.cpp
source/gameengine/Rasterizer/RAS_MeshObject.cpp

index 6973c19dea99018e1431329769645a95077425d8..dd22cf7c4843422d6c1607093e69c110e89be924 100644 (file)
@@ -165,7 +165,7 @@ extern "C" {
        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);
index 19f37a794846beb6b460464c756ec69234b40515..e6f5fda406620a02f078ef44a6250996a0a1fa44 100644 (file)
@@ -170,7 +170,7 @@ bool Armature::popQ(CacheTS timestamp)
 {
        if (m_qCCh >= 0) {
                double* item;
-               item = (double*)m_cache->getPreviousCacheItem(this, m_qCCh, &timestamp);
+               item = (double *)m_cache->getPreviousCacheItem(this, m_qCCh, &timestamp);
                if (item && m_qCTs != timestamp) {
                        double* q = m_qKdl(0);
                        memcpy(q, item, m_qKdl.rows()*sizeof(double));
@@ -698,8 +698,8 @@ void Armature::updateControlOutput(const Timestamp& timestamp)
                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);
index 0ca73b92071aa9e8b52254d1dc38bb85f8bbe53a..421821f3a2d3f7011e603f57abd8c9bff2211f3d 100644 (file)
@@ -1288,14 +1288,14 @@ void pbvh_bmesh_print(PBVH *bvh)
        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 @@ void pbvh_bmesh_print(PBVH *bvh)
                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)));
        }
 }
 
index b9352a250634e44e6cb779735547c4a95f9ae297..55a22fd361341d79a2e50d3a242a23f617dc3cff 100644 (file)
@@ -756,7 +756,7 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx)
                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);
                        }
index 4041fc2c755a734f9651b21d3e343de634731905..d235aaaa622a930897acb98115daa7611e65fde0 100644 (file)
@@ -1087,7 +1087,7 @@ void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
  * 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 @@ void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3])
 
 /**
  * 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])
 {
index 48958fbfc90e64800bfe0144f13b914d45160235..89bcebc41d6b7045a1c761dde9148c5798da8008 100644 (file)
@@ -184,7 +184,7 @@ void AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
        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 @@ void AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
                         */
                        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 @@ void AnimationExporter::dae_baked_object_animation(std::vector<float> &fra, Obje
        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 @@ void AnimationExporter::calc_ob_mat_at_time(Object *ob, float ctime , float mat[
 {
        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 @@ void AnimationExporter::calc_ob_mat_at_time(Object *ob, float ctime , float mat[
                        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);
index ed84dee046fe45dd4ce108c065b448ec068ca67b..0f8a4e5af7662ea6c49c9066694ae380a4f5d4cb 100644 (file)
@@ -674,7 +674,7 @@ void ArmatureImporter::make_shape_keys()
                
                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;
index 35fcc926beab2309720c9556b06c160681aa4b17..71a16df3b265150992793e171dcc484247968d60 100644 (file)
@@ -352,7 +352,7 @@ std::string ControllerExporter::add_morph_targets(Key *key, Object *ob)
 
        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 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob)
        
        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 @@ void ControllerExporter::add_weight_extras(Key *key)
        // 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) {
index 6644c46ac86b95dcd7712b4057139399d80a2688..669b787062a42c81182b156a8964253555151bd2 100644 (file)
@@ -155,7 +155,7 @@ void GeometryExporter::operator()(Object *ob)
        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) {
index f3844be525e38e6fa29100461a52eec5edc9bb36..89f8bb3226b2ee9424ec137962e5fe8657cbf798 100644 (file)
@@ -190,7 +190,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
        }
 
        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 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
                        
                                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;
                                                std::string tar_id(id_name(obtar));
                                                colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"target_id",tar_id);
index 144dfa948d099811bbf8ce68fda3f210c8322f28..d94b93725603cbab1c81b4c81651124fc9b89d08 100644 (file)
@@ -614,8 +614,8 @@ void PAINT_OT_image_paint(wmOperatorType *ot)
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
        RNA_def_enum(ot->srna, "mode", stroke_mode_items, BRUSH_STROKE_NORMAL,
-                                "Paint Stroke Mode",
-                                "Action taken when a paint stroke is made");
+                    "Paint Stroke Mode",
+                    "Action taken when a paint stroke is made");
 
        RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
index d6a3a6a6a3f46dddef72d5ff94a8ba4234495e62..d2cc42b0a56a5655cb341b8b9011c75c916273fe 100644 (file)
@@ -1129,7 +1129,7 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
        
        if (snode->nodetree) {
                bNode *node;
-               /* void** highlights = 0; */ /* UNUSED */
+               /* void **highlights = 0; */ /* UNUSED */
                
                node_uiblocks_init(C, snode->nodetree);
                
index 51f2659fccdf9b6aed0865e4538b20ccf52614b8..d18ec225c5f4cff5f0521971f98d905e40f7cb3a 100644 (file)
@@ -2247,7 +2247,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (*func)(void *), boo
        
        /* Setting these temporarily is not nice */
        v3d->flag &= ~V3D_SELECT_OUTLINE;
-       U.glalphaclip = alphaoverride ? 0.5 : glalphaclip; /* not that nice but means we wont zoom into billboards */
+       U.glalphaclip = alphaoverride ? 0.5f : glalphaclip; /* not that nice but means we wont zoom into billboards */
        U.obcenter_dia = 0;
        
        setwinmatrixview3d(ar, v3d, NULL);
index 91e98181ab9242021d2a36578f13d04452d38c8f..8d425f98a251d4b85d054c6d0e129cb5abbcf489 100644 (file)
@@ -104,7 +104,7 @@ typedef struct IDProperty {
 /* 2 characters for ID code and 64 for actual name */
 #define MAX_ID_NAME    66
 
-/* There's a nasty circular dependency here.... void* to the rescue! I
+/* There's a nasty circular dependency here.... 'void *' to the rescue! I
  * really wonder why this is needed. */
 typedef struct ID {
        void *next, *prev;
index 933b7a78b59d9a87a5188803ab77e974d4775c23..e7c030d5cdf218a7ff5bc85c20683119f42be07b 100644 (file)
@@ -341,7 +341,7 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
                
                #define SUBTYPE(socktype, stypename, id, idname) \
                { \
-                       bNodeSocketValue##stypename * value = (bNodeSocketValue##stypename *)sock->default_value; \
+                       bNodeSocketValue##stypename *value = (bNodeSocketValue##stypename *)sock->default_value; \
                        if (value->subtype == PROP_##id) \
                                return &RNA_NodeSocket##stypename##idname; \
                }
index 4a8a06134c827e5d25144d3938b3ee9548bba48d..7e7c986c6ea20b0b3e0f114e4a67f47f8c0f0426 100644 (file)
@@ -295,8 +295,8 @@ static OSStatus AudioConverterInputCallback(AudioConverterRef inAudioConverter,
        
        qtexport->audioTotalExportedFrames += *ioNumberDataPackets;
        
-       AUD_readDevice(qtexport->audioInputDevice, (UInt8*)qtexport->audioInputBuffer, 
-                                  qtexport->audioInputFormat.mFramesPerPacket * *ioNumberDataPackets);
+       AUD_readDevice(qtexport->audioInputDevice, (UInt8 *)qtexport->audioInputBuffer,
+                      qtexport->audioInputFormat.mFramesPerPacket * *ioNumberDataPackets);
        
        ioData->mBuffers[0].mDataByteSize = qtexport->audioInputFormat.mBytesPerPacket * *ioNumberDataPackets;
        ioData->mBuffers[0].mData = qtexport->audioInputBuffer;
@@ -357,7 +357,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R
 
                        tmpnam(name);
                        strcat(name, extension);
-                       outputFileURL = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,(UInt8*) name, strlen(name), false);
+                       outputFileURL = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,(UInt8 *)name, strlen(name), false);
                        
                        if (outputFileURL) {
                                
index aa8ab8c3da4ddeb56fcf1c6ec82b659c4ba66770..07a1cd26c4733738f21898982201e286c31b0710 100644 (file)
@@ -103,12 +103,12 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c);
 #define RE_rayobject_isVlakPrimitive(o)        ((((intptr_t)o)&3) == 3)
 
 /* used to align a given ray object */
-#define RE_rayobject_align(o)                                  ((RayObject*)(((intptr_t)o)&(~3)))
+#define RE_rayobject_align(o)                                  ((RayObject *)(((intptr_t)o)&(~3)))
 
 /* used to unalign a given ray object */
-#define RE_rayobject_unalignRayFace(o)                 ((RayObject*)(((intptr_t)o)|1))
-#define RE_rayobject_unalignRayAPI(o)                  ((RayObject*)(((intptr_t)o)|2))
-#define RE_rayobject_unalignVlakPrimitive(o)   ((RayObject*)(((intptr_t)o)|3))
+#define RE_rayobject_unalignRayFace(o)                 ((RayObject *)(((intptr_t)o)|1))
+#define RE_rayobject_unalignRayAPI(o)                  ((RayObject *)(((intptr_t)o)|2))
+#define RE_rayobject_unalignVlakPrimitive(o)   ((RayObject *)(((intptr_t)o)|3))
 
 /*
  * This rayobject represents a generic object. With it's own callbacks for raytrace operations.
index 3c4eb814d79db5b7d0b8ebb5c991921ec4aa8d90..e67c8520e75465bf561239dad9ac39cb427592a9 100644 (file)
@@ -1484,7 +1484,7 @@ static void tag_scenes_for_render(Render *re)
                        if (node->id) {
                                if (!MAIN_VERSION_ATLEAST(re->main, 265, 5)) {
                                        if (rlayer_node_uses_alpha(re->scene->nodetree, node)) {
-                                               Scene *scene = (Scene*) node->id;
+                                               Scene *scene = (Scene *)node->id;
 
                                                if (scene->r.alphamode != R_ALPHAPREMUL) {
                                                        BKE_reportf(re->reports, RPT_WARNING, "Setting scene %s alpha mode to Premul", scene->id.name + 2);
index 0a8af1c368b50d3cf6481e41e542adda6e6dd299..8169250f74f4d4b2af81eeff97d69a9f9356ef70 100644 (file)
@@ -938,7 +938,7 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr)
                //      TABLEINITSIZE, obr->blohalen+TABLEINITSIZE );
                temp=obr->bloha;
                
-               obr->bloha = (HaloRen**)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha");
+               obr->bloha = (HaloRen **)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha");
                if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void *));
                memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE * sizeof(void *));
                obr->blohalen+=TABLEINITSIZE;  /*Does this really need to be power of 2?*/
index 8be96e5390d2314d4120031dd2360565b495c843..28193b71bbd89a050e1af3508699b60a69ed20fc 100644 (file)
@@ -497,8 +497,8 @@ void WM_operator_properties_free(struct PointerRNA *ptr) {}
 void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring) {}
 void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot) {}
 void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context) {};
-void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {}
-void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void*), void *userdata) {}
+void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {}
+void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType*, void *), void *userdata) {}
 void WM_operator_bl_idname(char *to, const char *from) {}
 void WM_operator_py_idname(char *to, const char *from) {}
 void WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height) {}
index 379be91b52308cb3ccebc97126e3bdab8eaf0eba..131fdaed3ec2f324a83a99be84303164302fcf95 100644 (file)
@@ -130,10 +130,10 @@ void BL_ArmatureConstraint::ReParent(BL_ArmatureObject* armature)
                m_constraint = NULL;
                m_posechannel = NULL;
                // and locate the constraint
-               for (pchan = (bPoseChannel*)newpose->chanbase.first; pchan; pchan=(bPoseChannel*)pchan->next) {
+               for (pchan = (bPoseChannel*)newpose->chanbase.first; pchan; pchan = (bPoseChannel*)pchan->next) {
                        if (!strcmp(pchan->name, posechannel)) {
                                // now locate the constraint
-                               for (pcon = (bConstraint*)pchan->constraints.first; pcon; pcon=(bConstraint*)pcon->next) {
+                               for (pcon = (bConstraint *)pchan->constraints.first; pcon; pcon = (bConstraint *)pcon->next) {
                                        if (!strcmp(pcon->name, constraint)) {
                                                m_constraint = pcon;
                                                m_posechannel = pchan;
index 395a57d753c2f1635f4d46270c4f85079997c3c2..55d9decb333ae87f651e0f1b33868356ac51b9ea 100644 (file)
@@ -100,14 +100,14 @@ void game_copy_pose(bPose **dst, bPose *src, int copy_constraint)
        /* remap pointers */
        ghash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "game_copy_pose gh");
 
-       pchan= (bPoseChannel*)src->chanbase.first;
-       outpchan= (bPoseChannel*)out->chanbase.first;
+       pchan= (bPoseChannel *)src->chanbase.first;
+       outpchan= (bPoseChannel *)out->chanbase.first;
        for (; pchan; pchan=pchan->next, outpchan=outpchan->next)
                BLI_ghash_insert(ghash, pchan, outpchan);
 
-       for (pchan = (bPoseChannel*)out->chanbase.first; pchan; pchan = pchan->next) {
-               pchan->parent= (bPoseChannel*)BLI_ghash_lookup(ghash, pchan->parent);
-               pchan->child= (bPoseChannel*)BLI_ghash_lookup(ghash, pchan->child);
+       for (pchan = (bPoseChannel *)out->chanbase.first; pchan; pchan = pchan->next) {
+               pchan->parent= (bPoseChannel *)BLI_ghash_lookup(ghash, pchan->parent);
+               pchan->child= (bPoseChannel *)BLI_ghash_lookup(ghash, pchan->child);
 
                if (copy_constraint) {
                        ListBase listb;
@@ -158,8 +158,8 @@ void game_blend_poses(bPose *dst, bPose *src, float srcweight/*, short mode*/)
                dstweight = 1.0F;
        }
        
-       schan= (bPoseChannel*)src->chanbase.first;
-       for (dchan = (bPoseChannel*)dst->chanbase.first; dchan; dchan=(bPoseChannel*)dchan->next, schan= (bPoseChannel*)schan->next) {
+       schan= (bPoseChannel *)src->chanbase.first;
+       for (dchan = (bPoseChannel *)dst->chanbase.first; dchan; dchan=(bPoseChannel *)dchan->next, schan= (bPoseChannel *)schan->next) {
                // always blend on all channels since we don't know which one has been set
                /* quat interpolation done separate */
                if (schan->rotmode == ROT_MODE_QUAT) {
@@ -376,7 +376,7 @@ void BL_ArmatureObject::LoadChannels()
                BL_ArmatureChannel* proxy;
        
                m_channelNumber = 0;
-               for (pchan = (bPoseChannel*)m_pose->chanbase.first; pchan; pchan=(bPoseChannel*)pchan->next) {
+               for (pchan = (bPoseChannel *)m_pose->chanbase.first; pchan; pchan=(bPoseChannel *)pchan->next) {
                        proxy = new BL_ArmatureChannel(this, pchan);
                        m_poseChannels.AddBack(proxy);
                        m_channelNumber++;
index e3fd662e16fe0258ae81e95ffa53281b3d80f622..6262f8e48ce110497417246a04da7634c37d9c55 100644 (file)
@@ -2140,7 +2140,7 @@ static void UNUSED_FUNCTION(RBJconstraints)(Object *ob)//not used
        conlist = get_active_constraints2(ob);
 
        if (conlist) {
-               for (curcon = (bConstraint *)conlist->first; curcon; curcon=(bConstraint *)curcon->next) {
+               for (curcon = (bConstraint *)conlist->first; curcon; curcon = (bConstraint *)curcon->next) {
 
                        printf("%i\n",curcon->type);
                }
@@ -2785,7 +2785,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                        continue;
 
                if (conlist) {
-                       for (curcon = (bConstraint *)conlist->first; curcon; curcon=(bConstraint *)curcon->next) {
+                       for (curcon = (bConstraint *)conlist->first; curcon; curcon = (bConstraint *)curcon->next) {
                                if (curcon->type==CONSTRAINT_TYPE_RIGIDBODYJOINT) {
 
                                        bRigidBodyJointConstraint *dat=(bRigidBodyJointConstraint *)curcon->data;
index 4967401f2797ade7381406b4ce648525c2b7c403..3a4a27a6722c3dc570363ec88fc9abbe28e71305 100644 (file)
@@ -94,7 +94,7 @@ bool BL_DeformableGameObject::GetShape(vector<float> &shape)
                if (key && key->type==KEY_RELATIVE) 
                {
                        KeyBlock *kb;
-                       for (kb = (KeyBlock*)key->block.first; kb; kb = (KeyBlock*)kb->next)
+                       for (kb = (KeyBlock *)key->block.first; kb; kb = (KeyBlock *)kb->next)
                        {
                                shape.push_back(kb->curval);
                        }
index d8b4f6aaf1c23042613bf7893987976e77d505eb..4806ed04cc67858691a341e733dc8a0ad4f2d96b 100644 (file)
@@ -176,9 +176,9 @@ void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
        
        dstweight = 1.0F - srcweight;
 
-       for (it=m_blendshape.begin(), kb = (KeyBlock*)key->block.first; 
+       for (it=m_blendshape.begin(), kb = (KeyBlock *)key->block.first; 
             kb && it != m_blendshape.end();
-            kb = (KeyBlock*)kb->next, it++)
+            kb = (KeyBlock *)kb->next, it++)
        {
                kb->curval = kb->curval * dstweight + (*it) * srcweight;
        }
@@ -439,7 +439,7 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
                                KeyBlock *kb;
                                // We go through and clear out the keyblocks so there isn't any interference
                                // from other shape actions
-                               for (kb=(KeyBlock*)key->block.first; kb; kb=(KeyBlock*)kb->next)
+                               for (kb=(KeyBlock *)key->block.first; kb; kb=(KeyBlock *)kb->next)
                                        kb->curval = 0.f;
 
                                animsys_evaluate_action(m_idptr, m_action, NULL, m_localtime);
index 1a49f76e71a88768c5bfa36444c56f7cc87404df..fa00cafa148da2f7c1f9ad1bb7a8249d483430d2 100644 (file)
@@ -239,7 +239,7 @@ bool BL_Action::Play(const char* name,
                        // Now that we have the previous blend shape saved, we can clear out the key to avoid any
                        // further interference.
                        KeyBlock *kb;
-                       for (kb=(KeyBlock*)shape_deformer->GetKey()->block.first; kb; kb=(KeyBlock*)kb->next)
+                       for (kb=(KeyBlock *)shape_deformer->GetKey()->block.first; kb; kb=(KeyBlock *)kb->next)
                                kb->curval = 0.f;
                }
        }
@@ -358,9 +358,9 @@ void BL_Action::BlendShape(Key* key, float srcweight, std::vector<float>& blends
        
        dstweight = 1.0F - srcweight;
        //printf("Dst: %f\tSrc: %f\n", srcweight, dstweight);
-       for (it=blendshape.begin(), kb = (KeyBlock*)key->block.first; 
+       for (it=blendshape.begin(), kb = (KeyBlock *)key->block.first; 
             kb && it != blendshape.end();
-            kb = (KeyBlock*)kb->next, it++)
+            kb = (KeyBlock *)kb->next, it++)
        {
                //printf("OirgKeys: %f\t%f\n", kb->curval, (*it));
                kb->curval = kb->curval * dstweight + (*it) * srcweight;
@@ -478,7 +478,7 @@ void BL_Action::Update(float curtime)
                                // We go through and clear out the keyblocks so there isn't any interference
                                // from other shape actions
                                KeyBlock *kb;
-                               for (kb=(KeyBlock*)key->block.first; kb; kb=(KeyBlock*)kb->next)
+                               for (kb=(KeyBlock *)key->block.first; kb; kb=(KeyBlock *)kb->next)
                                        kb->curval = 0.f;
 
                                // Now blend the shape
index 523f3ceeaeac16df4757136e6e2d038846dbbaf6..c111a4de0eb7c5fc6edf9cc99eb3b21c50613c64 100644 (file)
@@ -80,7 +80,7 @@ void KX_ArmatureSensor::FindConstraint()
                for (pchan = (bPoseChannel*)pose->chanbase.first; pchan; pchan=(bPoseChannel*)pchan->next) {
                        if (!strcmp(pchan->name, m_posechannel)) {
                                // now locate the constraint
-                               for (pcon = (bConstraint*)pchan->constraints.first; pcon; pcon=(bConstraint*)pcon->next) {
+                               for (pcon = (bConstraint *)pchan->constraints.first; pcon; pcon = (bConstraint *)pcon->next) {
                                        if (!strcmp(pcon->name, m_constraintname)) {
                                                if (pcon->flag & CONSTRAINT_DISABLE)
                                                        /* this constraint is not valid, can't use it */
index 49b7489530248ab94c0a2701cac99c60a504988a..2af71c5efa997dc72c9fd172854050ea394d6d0b 100644 (file)
@@ -115,7 +115,7 @@ RAS_MeshObject::RAS_MeshObject(Mesh* mesh)
                int count=0;
                // initialize weight cache for shape objects
                // count how many keys in this mesh
-               for (kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next)
+               for (kb= (KeyBlock *)m_mesh->key->block.first; kb; kb= (KeyBlock *)kb->next)
                        count++;
                m_cacheWeightIndex.resize(count,-1);
        }
@@ -129,7 +129,7 @@ RAS_MeshObject::~RAS_MeshObject()
        {
                KeyBlock *kb;
                // remove the weight cache to avoid memory leak 
-               for (kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next) {
+               for (kb = (KeyBlock *)m_mesh->key->block.first; kb; kb = (KeyBlock *)kb->next) {
                        if (kb->weights) 
                                MEM_freeN(kb->weights);
                        kb->weights= NULL;