fix for building with collada and some other warnings
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 09:38:38 +0000 (09:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Sep 2011 09:38:38 +0000 (09:38 +0000)
source/blender/collada/AnimationExporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/SceneExporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_navmesh.cpp
source/blender/makesrna/intern/rna_modifier.c
source/gameengine/Expressions/IfExpr.h
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/VideoTexture/blendVideoTex.cpp

index 498ccb5709d1dfd62bfba2ffdcea48122261bb09..2ea10111bb94b17951a82e21ea8695d22c25a804 100644 (file)
@@ -58,7 +58,7 @@ void AnimationExporter::operator() (Object *ob)
 {
        FCurve *fcu;
        char * transformName ;
-       bool isMatAnim = false;
+       /* bool isMatAnim = false; */ /* UNUSED */
 
        //Export transform animations
        if(ob->adt && ob->adt->action)
@@ -125,7 +125,7 @@ void AnimationExporter::operator() (Object *ob)
                if (!ma) continue;
                if(ma->adt && ma->adt->action)
                {
-                       isMatAnim = true;
+                       /* isMatAnim = true; */
                        fcu = (FCurve*)ma->adt->action->curves.first;
                        while (fcu) {
                                transformName = extract_transform_name( fcu->rna_path );
index 19fa54c5044e82fc7b95986fdc11ffb1171e099d..ae25d343d360266f99dd22c89c5d27b228b4e1d6 100644 (file)
@@ -576,7 +576,7 @@ void ArmatureImporter::set_pose ( Object * ob_arm ,  COLLADAFW::Node * root_node
    float obmat[4][4];
 
        float ax[3];
-       float angle = NULL;
+       float angle = 0.0f;
        
        // object-space
        get_node_mat(obmat, root_node, NULL, NULL);
index 5109df0bb6a4989ffca69246549212a7f144a06f..a561d18c6e37451264d14d3078c529e946c926ba 100644 (file)
@@ -126,7 +126,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
                if((ob->transflag & OB_DUPLIGROUP) == OB_DUPLIGROUP && ob->dup_group) {
                        GroupObject *go = NULL;
                        Group *gr = ob->dup_group;
-                       printf("group detected %u\n", gr);
+                       /* printf("group detected '%s'\n", gr->id.name+2); */
                        for(go = (GroupObject*)(gr->gobject.first); go; go=go->next) {
                                printf("\t%s\n", go->ob->id.name);
                        }
index c646ec555064e637fd234e7a1bd19a0b7b19955c..b451e278d4707158f746dec58ef528c71df9cf2d 100644 (file)
@@ -136,8 +136,8 @@ void ED_setflagsLatt(struct Object *obedit, int flag);
 /* object_modifier.c */
 enum {
        MODIFIER_APPLY_DATA=1,
-       MODIFIER_APPLY_SHAPE,
-} eModifier_Apply_Mode;
+       MODIFIER_APPLY_SHAPE
+};
 
 struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type);
 int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct ModifierData *md);
index 155ffd37627ba21b01b91aabd9f4865d3840cf92..d0768d30236ecb6073fb74fb8af9648bc57c1924 100644 (file)
@@ -312,7 +312,7 @@ static Object* createRepresentation(bContext *C, rcPolyMesh*& pmesh, rcPolyMeshD
 {
        float co[3], rot[3];
        EditMesh *em;
-       int i,j, k, polyverts;
+       int i,j, k;
        unsigned short* v;
        int face[3];
        Main *bmain = CTX_data_main(C);
@@ -355,7 +355,6 @@ static Object* createRepresentation(bContext *C, rcPolyMesh*& pmesh, rcPolyMeshD
                SWAP(float, co[1], co[2]);
                addvertlist(em, co, NULL);
        }
-       polyverts = pmesh->nverts;
 
        //create custom data layer to save polygon idx
        CustomData_add_layer_named(&em->fdata, CD_RECAST, CD_CALLOC, NULL, 0, "recastData");
index fe79ed9e5326a375ba480c51e7d02c10843c8b24..464f676b7f6d5831c656c25a6ef23cdd5b43d170 100644 (file)
@@ -2493,7 +2493,7 @@ static void rna_def_modifier_screw(BlenderRNA *brna)
 static void rna_def_modifier_navmesh(BlenderRNA *brna)
 {
        StructRNA *srna;
-       PropertyRNA *prop;
+       /* PropertyRNA *prop; */ /* UNUSED */
 
        srna= RNA_def_struct(brna, "NavMeshModifier", "Modifier");
        RNA_def_struct_ui_text(srna, "NavMesh Modifier", "NavMesh modifier");
index 5ac8d835afd0acd59329094bd57219ff2b15743e..e67134c2271dd6fda9e33bed2b514a7252c6013c 100644 (file)
@@ -20,7 +20,7 @@
 #if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_)
 #define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_
 
-#if _MSC_VER >= 1000
+#if defined(_MSC_VER) && _MSC_VER >= 1000
 #pragma once
 #endif // _MSC_VER >= 1000
 
index 293fc6eaa08366d987ee62fbfe37083f0d199b16..9fd87b03d296e7ec7c9fe84137ed441fd0a5a1ad 100644 (file)
@@ -237,7 +237,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts,
                                copy_v3_v3(vert, pos);
                        else
                        {
-                               memset(vert, NULL, 3*sizeof(float)); //vertex isn't in any poly, set dummy zero coordinates
+                               memset(vert, 0, 3*sizeof(float)); //vertex isn't in any poly, set dummy zero coordinates
                        }
                        vert+=3;                
                }
index 2cb3831de5254d416cd529bc2294f72dfb9af231..e7244265fc433e17c2a772a107aa41ec3d28b8db 100644 (file)
@@ -112,7 +112,7 @@ static PyMethodDef moduleMethods[] =
        {NULL}  /* Sentinel */
 };
 
-#if WITH_FFMPEG
+#ifdef WITH_FFMPEG
 extern PyTypeObject VideoFFmpegType;
 extern PyTypeObject ImageFFmpegType;
 #endif
@@ -134,7 +134,7 @@ extern PyTypeObject ImageViewportType;
 
 static void registerAllTypes(void)
 {
-#if WITH_FFMPEG
+#ifdef WITH_FFMPEG
        pyImageTypes.add(&VideoFFmpegType, "VideoFFmpeg");
        pyImageTypes.add(&ImageFFmpegType, "ImageFFmpeg");
 #endif