Revision: 42524
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42524
Author: campbellbarton
Date: 2011-12-09 01:27:59 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
remove redundant cases. no functional change.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
Modified: trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
2011-12-09 00:24:48 UTC (rev 42523)
+++ trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
2011-12-09 01:27:59 UTC (rev 42524)
@@ -78,7 +78,8 @@
/* try to resolve the path */
if (RNA_path_resolve(&id_ptr, fcu->rna_path, &ptr, &prop)) {
- char *structname=NULL, *propname=NULL, arrayindbuf[16];
+ const char *structname=NULL, *propname=NULL;
+ char arrayindbuf[16];
const char *arrayname=NULL;
short free_structname = 0;
@@ -122,11 +123,11 @@
free_structname= 1;
}
else
- structname= (char
*)RNA_struct_ui_name(ptr.type);
+ structname=
RNA_struct_ui_name(ptr.type);
}
/* Property Name is straightforward */
- propname= (char *)RNA_property_ui_name(prop);
+ propname= RNA_property_ui_name(prop);
/* Array Index - only if applicable */
if (RNA_property_array_length(&ptr, prop)) {
@@ -153,7 +154,7 @@
/* free temp name if nameprop is set */
if (free_structname)
- MEM_freeN(structname);
+ MEM_freeN((void *)structname);
/* Icon for this property's owner:
Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c 2011-12-09
00:24:48 UTC (rev 42523)
+++ trunk/blender/source/blender/editors/animation/keyframing.c 2011-12-09
01:27:59 UTC (rev 42524)
@@ -524,7 +524,8 @@
enum {
VISUALKEY_NONE = 0,
VISUALKEY_LOC,
- VISUALKEY_ROT,
+ VISUALKEY_ROT
+ /* VISUALKEY_SCA */ /* TODO - looks like support can be added now */
};
/* This helper function determines if visual-keyframing should be used when
@@ -655,7 +656,7 @@
*/
static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int
array_index)
{
- char *identifier= (char *)RNA_property_identifier(prop);
+ const char *identifier= RNA_property_identifier(prop);
/* handle for Objects or PoseChannels only
* - constraints can be on either Objects or PoseChannels, so we
only check if the
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
2011-12-09 00:24:48 UTC (rev 42523)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
2011-12-09 01:27:59 UTC (rev 42524)
@@ -977,7 +977,7 @@
if(te->name)
te->flag |= TE_FREE_NAME;
else
- te->name= (char*)RNA_struct_ui_name(ptr->type);
+ te->name= RNA_struct_ui_name(ptr->type);
/* If searching don't expand RNA entries */
if(SEARCHING_OUTLINER(soops) &&
BLI_strcasecmp("RNA",te->name)==0) tselem->flag &= ~TSE_CHILDSEARCH;
@@ -1007,7 +1007,7 @@
prop= propptr.data;
proptype= RNA_property_type(prop);
- te->name= (char*)RNA_property_ui_name(prop);
+ te->name= RNA_property_ui_name(prop);
te->directdata= prop;
te->rnaptr= *ptr;
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-12-09
00:24:48 UTC (rev 42523)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-12-09
01:27:59 UTC (rev 42524)
@@ -3751,7 +3751,7 @@
BLI_dynstr_append(dynstr, ".");
}
- BLI_dynstr_append(dynstr, (char*)RNA_property_identifier(prop));
+ BLI_dynstr_append(dynstr, RNA_property_identifier(prop));
if(RNA_property_type(prop) == PROP_COLLECTION) {
/* add ["strkey"] or [intkey] */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
