code cleanup: warnings, style
authorCampbell Barton <ideasman42@gmail.com>
Sun, 25 Nov 2012 15:05:17 +0000 (15:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 25 Nov 2012 15:05:17 +0000 (15:05 +0000)
source/blender/editors/object/object_shapekey.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/makesrna/intern/rna_access.c

index 2b6d69ca694a6c6aa3b6d57827bd218af2dd48bf..6a511d4d9244fbabd7585e30a0782d43cc849e63 100644 (file)
@@ -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);
        }
index 5aee90f08605b0d4ee8c3f0aba8a7d240c75d895..cddfae53f6f06382bbfd4fb2b2c4b4ca06fc6392 100644 (file)
@@ -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);
index a69bc8f2d21ef83abc1b4c805b97d49428f3e709..470e87daeea9b7345ce7d8339aa62b7cb7920dd8 100644 (file)
@@ -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)) {