diff options
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 2b6d69ca694..6a511d4d924 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -137,9 +137,11 @@ static int ED_object_shape_key_remove(bContext *C, Object *ob) } if (key->totkey == 0) { - if (GS(key->from->name) == ID_ME) ((Mesh *)key->from)->key = NULL; - else if (GS(key->from->name) == ID_CU) ((Curve *)key->from)->key = NULL; - else if (GS(key->from->name) == ID_LT) ((Lattice *)key->from)->key = NULL; + switch (GS(key->from->name)) { + case ID_ME: ((Mesh *)key->from)->key = NULL; break; + case ID_CU: ((Curve *)key->from)->key = NULL; break; + case ID_LT: ((Lattice *)key->from)->key = NULL; break; + } BKE_libblock_free_us(&(bmain->key), key); } diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 5aee90f0860..cddfae53f6f 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -369,8 +369,6 @@ static int initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *event } /* store the original camera loc and rot */ - /* TODO. axis angle etc */ - fly->obtfm = BKE_object_tfm_backup(ob_back); BKE_object_where_is_calc(fly->scene, fly->v3d->camera); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index a69bc8f2d21..470e87daeea 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -4150,7 +4150,7 @@ char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop) path = BLI_sprintfN(is_rna ? "%s.%s" : "%s[\"%s\"]", ptrpath, propname); MEM_freeN(ptrpath); } - else if(RNA_struct_is_ID(ptr->type)) { + else if (RNA_struct_is_ID(ptr->type)) { if (is_rna) path = BLI_strdup(propname); else @@ -5953,7 +5953,7 @@ int RNA_property_equals(PointerRNA *a, PointerRNA *b, PropertyRNA *prop) int RNA_struct_equals(PointerRNA *a, PointerRNA *b) { CollectionPropertyIterator iter; - CollectionPropertyRNA *citerprop; +// CollectionPropertyRNA *citerprop; /* UNUSED */ PropertyRNA *iterprop; int equals = 1; @@ -5965,7 +5965,7 @@ int RNA_struct_equals(PointerRNA *a, PointerRNA *b) return 0; iterprop = RNA_struct_iterator_property(a->type); - citerprop = (CollectionPropertyRNA *)rna_ensure_property(iterprop); +// citerprop = (CollectionPropertyRNA *)rna_ensure_property(iterprop); /* UNUSED */ RNA_property_collection_begin(a, iterprop, &iter); for (; iter.valid; RNA_property_collection_next(&iter)) { |