sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: warnings, style

Browse Source
This commit is contained in:
Campbell Barton 2012-11-25 15:05:17 +00:00
parent 3a7d4d661f
commit ea828fd20e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/object/object_shapekey.c
View 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);
}

2
source/blender/editors/space_view3d/view3d_fly.c
View 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);

6
source/blender/makesrna/intern/rna_access.c
View 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)) {