[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52544] trunk/blender/source/blender: code cleanup: warnings, style
Campbell Barton
ideasman42 at gmail.com
Sun Nov 25 16:05:18 CET 2012
Revision: 52544
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52544
Author: campbellbarton
Date: 2012-11-25 15:05:17 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
code cleanup: warnings, style
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_shapekey.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
Modified: trunk/blender/source/blender/editors/object/object_shapekey.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_shapekey.c 2012-11-25 13:52:13 UTC (rev 52543)
+++ trunk/blender/source/blender/editors/object/object_shapekey.c 2012-11-25 15:05:17 UTC (rev 52544)
@@ -137,9 +137,11 @@
}
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);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2012-11-25 13:52:13 UTC (rev 52543)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2012-11-25 15:05:17 UTC (rev 52544)
@@ -369,8 +369,6 @@
}
/* 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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2012-11-25 13:52:13 UTC (rev 52543)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2012-11-25 15:05:17 UTC (rev 52544)
@@ -4150,7 +4150,7 @@
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_struct_equals(PointerRNA *a, PointerRNA *b)
{
CollectionPropertyIterator iter;
- CollectionPropertyRNA *citerprop;
+// CollectionPropertyRNA *citerprop; /* UNUSED */
PropertyRNA *iterprop;
int equals = 1;
@@ -5965,7 +5965,7 @@
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)) {
More information about the Bf-blender-cvs
mailing list