[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41873] trunk/blender/source/blender: py/ rna api was calling RNA_property_type more often then needed ( no functional change)

[Campbell Barton]

Revision: 41873
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41873
Author:   campbellbarton
Date:     2011-11-15 11:56:54 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
py/rna api was calling RNA_property_type more often then needed (no functional change)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2011-11-15 11:34:49 UTC (rev 41872)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2011-11-15 11:56:54 UTC (rev 41873)
@@ -252,7 +252,7 @@
 		size_to_mat3(smat, texmap->size);
 		
 		/* rotation */
-		/* XXX TexMapping rotation are now in radians. */
+		/* TexMapping rotation are now in radians. */
 		eul_to_mat3(rmat, texmap->rot);
 		
 		/* compose it all */

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-11-15 11:34:49 UTC (rev 41872)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-11-15 11:56:54 UTC (rev 41873)
@@ -598,7 +598,7 @@
 	int subtype, totdim;
 	int len;
 	int is_thick;
-	int flag= RNA_property_flag(prop);
+	const int flag= RNA_property_flag(prop);
 
 	/* disallow dynamic sized arrays to be wrapped since the size could change
 	 * to a size mathutils does not support */
@@ -614,7 +614,7 @@
 		if (!is_thick)
 			ret= pyrna_prop_CreatePyObject(ptr, prop); /* owned by the mathutils PyObject */
 
-		switch(RNA_property_subtype(prop)) {
+		switch(subtype) {
 		case PROP_ALL_VECTOR_SUBTYPES:
 			if (len>=2 && len <= 4) {
 				if (is_thick) {
@@ -902,7 +902,7 @@
 	}
 
 	/* if a pointer, try to print name of pointer target too */
-	if (RNA_property_type(self->prop) == PROP_POINTER) {
+	if (type == PROP_POINTER) {
 		ptr= RNA_property_pointer_get(&self->ptr, self->prop);
 		name= RNA_struct_name_get_alloc(&ptr, NULL, 0, NULL);
 
@@ -916,7 +916,7 @@
 			return ret;
 		}
 	}
-	if (RNA_property_type(self->prop) == PROP_COLLECTION) {
+	if (type == PROP_COLLECTION) {
 		PointerRNA r_ptr;
 		if (RNA_property_collection_type_get(&self->ptr, self->prop, &r_ptr)) {
 			return PyUnicode_FromFormat("<bpy_%.200s, %.200s>",
@@ -1301,7 +1301,7 @@
 PyObject *pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
 {
 	PyObject *ret;
-	int type= RNA_property_type(prop);
+	const int type= RNA_property_type(prop);
 
 	if (RNA_property_array_check(prop)) {
 		return pyrna_py_from_array(ptr, prop);
@@ -1320,7 +1320,7 @@
 		break;
 	case PROP_STRING:
 	{
-		int subtype= RNA_property_subtype(prop);
+		const int subtype= RNA_property_subtype(prop);
 		const char *buf;
 		int buf_len;
 		char buf_fixed[32];
@@ -1458,7 +1458,7 @@
 static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *value, const char *error_prefix)
 {
 	/* XXX hard limits should be checked here */
-	int type= RNA_property_type(prop);
+	const int type= RNA_property_type(prop);
 
 
 	if (RNA_property_array_check(prop)) {
@@ -1542,7 +1542,7 @@
 		}
 		case PROP_STRING:
 		{
-			int subtype= RNA_property_subtype(prop);
+			const int subtype= RNA_property_subtype(prop);
 			const char *param;
 
 			if (subtype == PROP_BYTESTRING) {
@@ -4411,8 +4411,8 @@
 static PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *data)
 {
 	PyObject *ret;
-	int type= RNA_property_type(prop);
-	int flag= RNA_property_flag(prop);
+	const int type= RNA_property_type(prop);
+	const int flag= RNA_property_flag(prop);
 
 	if (RNA_property_array_check(prop)) {
 		int a, len;
@@ -4488,7 +4488,7 @@
 		{
 			char *data_ch;
 			PyObject *value_coerce= NULL;
-			int subtype= RNA_property_subtype(prop);
+			const int subtype= RNA_property_subtype(prop);
 
 			if (flag & PROP_THICK_WRAP)
 				data_ch= (char *)data;