Revision: 40095
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40095
Author: campbellbarton
Date: 2011-09-10 09:38:38 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
fix for building with collada and some other warnings
Modified Paths:
--------------
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/object/object_navmesh.cpp
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/gameengine/Expressions/IfExpr.h
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2011-09-10
09:38:38 UTC (rev 40095)
@@ -58,7 +58,7 @@
{
FCurve *fcu;
char * transformName ;
- bool isMatAnim = false;
+ /* bool isMatAnim = false; */ /* UNUSED */
//Export transform animations
if(ob->adt && ob->adt->action)
@@ -125,7 +125,7 @@
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 );
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-09-10
09:38:38 UTC (rev 40095)
@@ -576,7 +576,7 @@
float obmat[4][4];
float ax[3];
- float angle = NULL;
+ float angle = 0.0f;
// object-space
get_node_mat(obmat, root_node, NULL, NULL);
Modified: trunk/blender/source/blender/collada/SceneExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.cpp 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/collada/SceneExporter.cpp 2011-09-10
09:38:38 UTC (rev 40095)
@@ -126,7 +126,7 @@
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);
}
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2011-09-10
09:38:38 UTC (rev 40095)
@@ -136,8 +136,8 @@
/* 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);
Modified: trunk/blender/source/blender/editors/object/object_navmesh.cpp
===================================================================
--- trunk/blender/source/blender/editors/object/object_navmesh.cpp
2011-09-10 09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/editors/object/object_navmesh.cpp
2011-09-10 09:38:38 UTC (rev 40095)
@@ -312,7 +312,7 @@
{
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 @@
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");
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-09-10
09:38:38 UTC (rev 40095)
@@ -2493,7 +2493,7 @@
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");
Modified: trunk/blender/source/gameengine/Expressions/IfExpr.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/IfExpr.h 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/gameengine/Expressions/IfExpr.h 2011-09-10
09:38:38 UTC (rev 40095)
@@ -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
Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2011-09-10
09:21:46 UTC (rev 40094)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2011-09-10
09:38:38 UTC (rev 40095)
@@ -237,7 +237,7 @@
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;
}
Modified: trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
2011-09-10 09:21:46 UTC (rev 40094)
+++ trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
2011-09-10 09:38:38 UTC (rev 40095)
@@ -112,7 +112,7 @@
{NULL} /* Sentinel */
};
-#if WITH_FFMPEG
+#ifdef WITH_FFMPEG
extern PyTypeObject VideoFFmpegType;
extern PyTypeObject ImageFFmpegType;
#endif
@@ -134,7 +134,7 @@
static void registerAllTypes(void)
{
-#if WITH_FFMPEG
+#ifdef WITH_FFMPEG
pyImageTypes.add(&VideoFFmpegType, "VideoFFmpeg");
pyImageTypes.add(&ImageFFmpegType, "ImageFFmpeg");
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
