diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
| commit | 357febc168cb13981f277b32f1ea2e3488b05b99 (patch) | |
| tree | 84cc46ed9754929e577e1b59c715297a7c1d59ff /source/blender/editors | |
| parent | 8ed1c07a7b21d916f149dfa00649579165c45979 (diff) | |
fix for building with collada and some other warnings
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_navmesh.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index c646ec55506..b451e278d47 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -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); diff --git a/source/blender/editors/object/object_navmesh.cpp b/source/blender/editors/object/object_navmesh.cpp index 155ffd37627..d0768d30236 100644 --- a/source/blender/editors/object/object_navmesh.cpp +++ b/source/blender/editors/object/object_navmesh.cpp @@ -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"); |