diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-29 04:20:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-29 04:20:28 +0400 |
commit | e32c60284aa843165ec980c4f7dfabe42d5ff6ee (patch) | |
tree | d53ee29c11b22bdf19c058379e145a28f375d35d /source/blender/makesrna | |
parent | 7ecc0ba99930fb0ab7a63134f03c9ba5b24c1910 (diff) |
style cleanup
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 26 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 25 |
2 files changed, 13 insertions, 38 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 8e9c0dbc4c4..5b5367654eb 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -2590,7 +2590,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA ptr PointerRNA RNA_property_pointer_get_default(PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop)) { - /*PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop; */ + /*PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop; */ /* BLI_assert(RNA_property_type(prop) == PROP_POINTER); */ @@ -2729,7 +2729,7 @@ int RNA_property_collection_length(PointerRNA *ptr, PropertyRNA *prop) void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr) { IDProperty *idprop; -/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */ +/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */ BLI_assert(RNA_property_type(prop) == PROP_COLLECTION); @@ -2788,7 +2788,7 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA int RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key) { IDProperty *idprop; -/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */ +/* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */ BLI_assert(RNA_property_type(prop) == PROP_COLLECTION); @@ -3035,11 +3035,11 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper #define RAW_GET(dtype, var, raw, a) \ { \ switch (raw.type) { \ - case PROP_RAW_CHAR: var = (dtype)((char*)raw.array)[a]; break; \ - case PROP_RAW_SHORT: var = (dtype)((short*)raw.array)[a]; break; \ - case PROP_RAW_INT: var = (dtype)((int*)raw.array)[a]; break; \ - case PROP_RAW_FLOAT: var = (dtype)((float*)raw.array)[a]; break; \ - case PROP_RAW_DOUBLE: var = (dtype)((double*)raw.array)[a]; break; \ + case PROP_RAW_CHAR: var = (dtype)((char *)raw.array)[a]; break; \ + case PROP_RAW_SHORT: var = (dtype)((short *)raw.array)[a]; break; \ + case PROP_RAW_INT: var = (dtype)((int *)raw.array)[a]; break; \ + case PROP_RAW_FLOAT: var = (dtype)((float *)raw.array)[a]; break; \ + case PROP_RAW_DOUBLE: var = (dtype)((double *)raw.array)[a]; break; \ default: var = (dtype)0; \ } \ } (void)0 @@ -3047,11 +3047,11 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper #define RAW_SET(dtype, raw, a, var) \ { \ switch (raw.type) { \ - case PROP_RAW_CHAR: ((char*)raw.array)[a] = (char)var; break; \ - case PROP_RAW_SHORT: ((short*)raw.array)[a] = (short)var; break; \ - case PROP_RAW_INT: ((int*)raw.array)[a] = (int)var; break; \ - case PROP_RAW_FLOAT: ((float*)raw.array)[a] = (float)var; break; \ - case PROP_RAW_DOUBLE: ((double*)raw.array)[a] = (double)var; break; \ + case PROP_RAW_CHAR: ((char *)raw.array)[a] = (char)var; break; \ + case PROP_RAW_SHORT: ((short *)raw.array)[a] = (short)var; break; \ + case PROP_RAW_INT: ((int *)raw.array)[a] = (int)var; break; \ + case PROP_RAW_FLOAT: ((float *)raw.array)[a] = (float)var; break; \ + case PROP_RAW_DOUBLE: ((double *)raw.array)[a] = (double)var; break; \ default: break; \ } \ } (void)0 diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 6b380886e28..5e95fa25cba 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -24,7 +24,6 @@ * \ingroup RNA */ - #include <stdlib.h> #include <string.h> @@ -206,30 +205,6 @@ EnumPropertyItem prop_wave_items[] = { #include "DNA_scene_types.h" #include "WM_api.h" -static void rna_Node_custom3_set_as_int(PointerRNA *ptr, int value) -{ - bNode *node = (bNode *)ptr->data; - node->custom3 = value; -} - -static int rna_Node_custom3_get_as_int(PointerRNA *ptr) -{ - bNode *node = (bNode *)ptr->data; - return (int)node->custom3; -} - -static void rna_Node_custom4_set_as_int(PointerRNA *ptr, int value) -{ - bNode *node = (bNode *)ptr->data; - node->custom4 = value; -} - -static int rna_Node_custom4_get_as_int(PointerRNA *ptr) -{ - bNode *node = (bNode *)ptr->data; - return (int)node->custom4; -} - static StructRNA *rna_Node_refine(struct PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; |