From 0114d78c33edfaef5bc412eefcb5d52a0a6823b0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 5 Mar 2012 23:30:41 +0000 Subject: Code cleanup in rna files (huge, higly automated with py script). Addresses: * C++ comments. * Spaces after if/for/while/switch statements. * Spaces around assignment operators. --- source/blender/makesrna/intern/rna_ID.c | 194 ++++++++++++++++---------------- 1 file changed, 97 insertions(+), 97 deletions(-) (limited to 'source/blender/makesrna/intern/rna_ID.c') diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index de0cd6d9c59..6ca66f1d116 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -84,30 +84,30 @@ EnumPropertyItem id_type_items[] = { /* name functions that ignore the first two ID characters */ void rna_ID_name_get(PointerRNA *ptr, char *value) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; BLI_strncpy(value, id->name+2, sizeof(id->name)-2); } int rna_ID_name_length(PointerRNA *ptr) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; return strlen(id->name+2); } void rna_ID_name_set(PointerRNA *ptr, const char *value) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; BLI_strncpy_utf8(id->name+2, value, sizeof(id->name)-2); test_idbutton(id->name+2); } static int rna_ID_name_editable(PointerRNA *ptr) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; if (GS(id->name) == ID_VF) { - VFont *vf= (VFont *)id; - if (strcmp(vf->name, FO_BUILTIN_NAME)==0) + VFont *vf = (VFont *)id; + if (strcmp(vf->name, FO_BUILTIN_NAME) == 0) return 0; } @@ -116,41 +116,41 @@ static int rna_ID_name_editable(PointerRNA *ptr) short RNA_type_to_ID_code(StructRNA *type) { - if(RNA_struct_is_a(type, &RNA_Action)) return ID_AC; - if(RNA_struct_is_a(type, &RNA_Armature)) return ID_AR; - if(RNA_struct_is_a(type, &RNA_Brush)) return ID_BR; - if(RNA_struct_is_a(type, &RNA_Camera)) return ID_CA; - if(RNA_struct_is_a(type, &RNA_Curve)) return ID_CU; - if(RNA_struct_is_a(type, &RNA_GreasePencil)) return ID_GD; - if(RNA_struct_is_a(type, &RNA_Group)) return ID_GR; - if(RNA_struct_is_a(type, &RNA_Image)) return ID_IM; - if(RNA_struct_is_a(type, &RNA_Key)) return ID_KE; - if(RNA_struct_is_a(type, &RNA_Lamp)) return ID_LA; - if(RNA_struct_is_a(type, &RNA_Library)) return ID_LI; - if(RNA_struct_is_a(type, &RNA_Lattice)) return ID_LT; - if(RNA_struct_is_a(type, &RNA_Material)) return ID_MA; - if(RNA_struct_is_a(type, &RNA_MetaBall)) return ID_MB; - if(RNA_struct_is_a(type, &RNA_NodeTree)) return ID_NT; - if(RNA_struct_is_a(type, &RNA_Mesh)) return ID_ME; - if(RNA_struct_is_a(type, &RNA_Object)) return ID_OB; - if(RNA_struct_is_a(type, &RNA_ParticleSettings)) return ID_PA; - if(RNA_struct_is_a(type, &RNA_Scene)) return ID_SCE; - if(RNA_struct_is_a(type, &RNA_Screen)) return ID_SCR; - if(RNA_struct_is_a(type, &RNA_Speaker)) return ID_SPK; - if(RNA_struct_is_a(type, &RNA_Sound)) return ID_SO; - if(RNA_struct_is_a(type, &RNA_Text)) return ID_TXT; - if(RNA_struct_is_a(type, &RNA_Texture)) return ID_TE; - if(RNA_struct_is_a(type, &RNA_VectorFont)) return ID_VF; - if(RNA_struct_is_a(type, &RNA_World)) return ID_WO; - if(RNA_struct_is_a(type, &RNA_WindowManager)) return ID_WM; - if(RNA_struct_is_a(type, &RNA_MovieClip)) return ID_MC; + if (RNA_struct_is_a(type, &RNA_Action)) return ID_AC; + if (RNA_struct_is_a(type, &RNA_Armature)) return ID_AR; + if (RNA_struct_is_a(type, &RNA_Brush)) return ID_BR; + if (RNA_struct_is_a(type, &RNA_Camera)) return ID_CA; + if (RNA_struct_is_a(type, &RNA_Curve)) return ID_CU; + if (RNA_struct_is_a(type, &RNA_GreasePencil)) return ID_GD; + if (RNA_struct_is_a(type, &RNA_Group)) return ID_GR; + if (RNA_struct_is_a(type, &RNA_Image)) return ID_IM; + if (RNA_struct_is_a(type, &RNA_Key)) return ID_KE; + if (RNA_struct_is_a(type, &RNA_Lamp)) return ID_LA; + if (RNA_struct_is_a(type, &RNA_Library)) return ID_LI; + if (RNA_struct_is_a(type, &RNA_Lattice)) return ID_LT; + if (RNA_struct_is_a(type, &RNA_Material)) return ID_MA; + if (RNA_struct_is_a(type, &RNA_MetaBall)) return ID_MB; + if (RNA_struct_is_a(type, &RNA_NodeTree)) return ID_NT; + if (RNA_struct_is_a(type, &RNA_Mesh)) return ID_ME; + if (RNA_struct_is_a(type, &RNA_Object)) return ID_OB; + if (RNA_struct_is_a(type, &RNA_ParticleSettings)) return ID_PA; + if (RNA_struct_is_a(type, &RNA_Scene)) return ID_SCE; + if (RNA_struct_is_a(type, &RNA_Screen)) return ID_SCR; + if (RNA_struct_is_a(type, &RNA_Speaker)) return ID_SPK; + if (RNA_struct_is_a(type, &RNA_Sound)) return ID_SO; + if (RNA_struct_is_a(type, &RNA_Text)) return ID_TXT; + if (RNA_struct_is_a(type, &RNA_Texture)) return ID_TE; + if (RNA_struct_is_a(type, &RNA_VectorFont)) return ID_VF; + if (RNA_struct_is_a(type, &RNA_World)) return ID_WO; + if (RNA_struct_is_a(type, &RNA_WindowManager)) return ID_WM; + if (RNA_struct_is_a(type, &RNA_MovieClip)) return ID_MC; return 0; } StructRNA *ID_code_to_RNA_type(short idcode) { - switch(idcode) { + switch (idcode) { case ID_AC: return &RNA_Action; case ID_AR: return &RNA_Armature; case ID_BR: return &RNA_Brush; @@ -185,7 +185,7 @@ StructRNA *ID_code_to_RNA_type(short idcode) StructRNA *rna_ID_refine(PointerRNA *ptr) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; return ID_code_to_RNA_type(GS(id->name)); } @@ -197,13 +197,13 @@ IDProperty *rna_ID_idprops(PointerRNA *ptr, int create) void rna_ID_fake_user_set(PointerRNA *ptr, int value) { - ID *id= (ID*)ptr->data; + ID *id = (ID*)ptr->data; - if(value && !(id->flag & LIB_FAKEUSER)) { + if (value && !(id->flag & LIB_FAKEUSER)) { id->flag |= LIB_FAKEUSER; id_us_plus(id); } - else if(!value && (id->flag & LIB_FAKEUSER)) { + else if (!value && (id->flag & LIB_FAKEUSER)) { id->flag &= ~LIB_FAKEUSER; id_us_min(id); } @@ -227,19 +227,19 @@ StructRNA *rna_PropertyGroup_register(Main *UNUSED(bmain), ReportList *reports, RNA_pointer_create(NULL, &RNA_PropertyGroup, NULL, &dummyptr); /* validate the python class */ - if(validate(&dummyptr, data, NULL) != 0) + if (validate(&dummyptr, data, NULL) != 0) return NULL; /* note: it looks like there is no length limit on the srna id since its * just a char pointer, but take care here, also be careful that python * owns the string pointer which it could potentially free while blender * is running. */ - if(BLI_strnlen(identifier, MAX_IDPROP_NAME) == MAX_IDPROP_NAME) { + if (BLI_strnlen(identifier, MAX_IDPROP_NAME) == MAX_IDPROP_NAME) { BKE_reportf(reports, RPT_ERROR, "registering id property class: '%s' is too long, maximum length is " STRINGIFY(MAX_IDPROP_NAME), identifier); return NULL; } - return RNA_def_struct(&BLENDER_RNA, identifier, "PropertyGroup"); // XXX + return RNA_def_struct(&BLENDER_RNA, identifier, "PropertyGroup"); /* XXX */ } StructRNA* rna_PropertyGroup_refine(PointerRNA *ptr) @@ -251,8 +251,8 @@ ID *rna_ID_copy(ID *id) { ID *newid; - if(id_copy(id, &newid, 0)) { - if(newid) id_us_min(newid); + if (id_copy(id, &newid, 0)) { + if (newid) id_us_min(newid); return newid; } @@ -268,14 +268,14 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) BKE_text_to_curve(sce, ob, CU_LEFT); }*/ - if(flag == 0) { + if (flag == 0) { /* pass */ } else { /* ensure flag us correct for the type */ - switch(GS(id->name)) { + switch (GS(id->name)) { case ID_OB: - if(flag & ~(OB_RECALC_ALL)) { + if (flag & ~(OB_RECALC_ALL)) { BKE_report(reports, RPT_ERROR, "'refresh' incompatible with Object ID type"); return; } @@ -298,28 +298,28 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) void rna_ID_user_clear(ID *id) { - id->us= 0; /* dont save */ + id->us = 0; /* dont save */ id->flag &= ~LIB_FAKEUSER; } static void rna_IDPArray_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { - IDProperty *prop= (IDProperty *)ptr->data; + IDProperty *prop = (IDProperty *)ptr->data; rna_iterator_array_begin(iter, IDP_IDPArray(prop), sizeof(IDProperty), prop->len, 0, NULL); } static int rna_IDPArray_length(PointerRNA *ptr) { - IDProperty *prop= (IDProperty *)ptr->data; + IDProperty *prop = (IDProperty *)ptr->data; return prop->len; } int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr) { - ID *id= ptr->id.data; - short *totcol= give_totcolp_id(id); - Material *mat_id= assign_ptr->id.data; - if(totcol && (key >= 0 && key < *totcol)) { + ID *id = ptr->id.data; + short *totcol = give_totcolp_id(id); + Material *mat_id = assign_ptr->id.data; + if (totcol && (key >= 0 && key < *totcol)) { assign_material_id(id, mat_id, key + 1); return 1; } @@ -330,7 +330,7 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig void rna_Library_filepath_set(PointerRNA *ptr, const char *value) { - Library *lib= (Library*)ptr->data; + Library *lib = (Library*)ptr->data; BKE_library_filepath_set(lib, value); } @@ -343,56 +343,56 @@ static void rna_def_ID_properties(BlenderRNA *brna) /* this is struct is used for holding the virtual * PropertyRNA's for ID properties */ - srna= RNA_def_struct(brna, "PropertyGroupItem", NULL); + srna = RNA_def_struct(brna, "PropertyGroupItem", NULL); RNA_def_struct_sdna(srna, "IDProperty"); RNA_def_struct_ui_text(srna, "ID Property", "Property that stores arbitrary, user defined properties"); /* IDP_STRING */ - prop= RNA_def_property(srna, "string", PROP_STRING, PROP_NONE); + prop = RNA_def_property(srna, "string", PROP_STRING, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); /* IDP_INT */ - prop= RNA_def_property(srna, "int", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "int", PROP_INT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); - prop= RNA_def_property(srna, "int_array", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "int_array", PROP_INT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_FLOAT */ - prop= RNA_def_property(srna, "float", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "float", PROP_FLOAT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); - prop= RNA_def_property(srna, "float_array", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "float_array", PROP_FLOAT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_DOUBLE */ - prop= RNA_def_property(srna, "double", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "double", PROP_FLOAT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); - prop= RNA_def_property(srna, "double_array", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "double_array", PROP_FLOAT, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_array(prop, 1); /* IDP_GROUP */ - prop= RNA_def_property(srna, "group", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "group", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "PropertyGroup"); - prop= RNA_def_property(srna, "collection", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "collection", PROP_COLLECTION, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_struct_type(prop, "PropertyGroup"); - prop= RNA_def_property(srna, "idp_array", PROP_COLLECTION, PROP_NONE); + prop = RNA_def_property(srna, "idp_array", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "PropertyGroup"); RNA_def_property_collection_funcs(prop, "rna_IDPArray_begin", "rna_iterator_array_next", "rna_iterator_array_end", "rna_iterator_array_get", "rna_IDPArray_length", NULL, NULL, NULL); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); - // never tested, maybe its useful to have this? + /* never tested, maybe its useful to have this? */ #if 0 - prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); + prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Name", "Unique name used in the code and scripting"); @@ -404,7 +404,7 @@ static void rna_def_ID_properties(BlenderRNA *brna) /* ID property groups > level 0, since level 0 group is merged * with native RNA properties. the builtin_properties will take * care of the properties here */ - srna= RNA_def_struct(brna, "PropertyGroup", NULL); + srna = RNA_def_struct(brna, "PropertyGroup", NULL); RNA_def_struct_sdna(srna, "IDPropertyGroup"); RNA_def_struct_ui_text(srna, "ID Property Group", "Group of ID properties"); RNA_def_struct_idprops_func(srna, "rna_PropertyGroup_idprops"); @@ -414,9 +414,9 @@ static void rna_def_ID_properties(BlenderRNA *brna) /* important so python types can have their name used in list views * however this isnt prefect because it overrides how python would set the name * when we only really want this so RNA_def_struct_name_property() is set to something useful */ - prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); + prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_flag(prop, PROP_EXPORT|PROP_IDPROPERTY); - //RNA_def_property_clear_flag(prop, PROP_EDITABLE); + /*RNA_def_property_clear_flag(prop, PROP_EDITABLE); */ RNA_def_property_ui_text(prop, "Name", "Unique name used in the code and scripting"); RNA_def_struct_name_property(srna, prop); } @@ -429,21 +429,21 @@ static void rna_def_ID_materials(BlenderRNA *brna) PropertyRNA *parm; /* for mesh/mball/curve materials */ - srna= RNA_def_struct(brna, "IDMaterials", NULL); + srna = RNA_def_struct(brna, "IDMaterials", NULL); RNA_def_struct_sdna(srna, "ID"); RNA_def_struct_ui_text(srna, "ID Materials", "Collection of materials"); - func= RNA_def_function(srna, "append", "material_append_id"); + func = RNA_def_function(srna, "append", "material_append_id"); RNA_def_function_ui_description(func, "Add a new material to the data block"); - parm= RNA_def_pointer(func, "material", "Material", "", "Material to add"); + parm = RNA_def_pointer(func, "material", "Material", "", "Material to add"); RNA_def_property_flag(parm, PROP_REQUIRED); - func= RNA_def_function(srna, "pop", "material_pop_id"); + func = RNA_def_function(srna, "pop", "material_pop_id"); RNA_def_function_ui_description(func, "Remove a material from the data block"); - parm= RNA_def_int(func, "index", 0, 0, MAXMAT, "", "Index of material to remove", 0, MAXMAT); + parm = RNA_def_int(func, "index", 0, 0, MAXMAT, "", "Index of material to remove", 0, MAXMAT); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "update_data", 0, "", "Update data by re-adjusting the material slots assigned"); - parm= RNA_def_pointer(func, "material", "Material", "", "Material to remove"); + parm = RNA_def_pointer(func, "material", "Material", "", "Material to remove"); RNA_def_function_return(func, parm); } @@ -459,13 +459,13 @@ static void rna_def_ID(BlenderRNA *brna) {OB_RECALC_TIME, "TIME", 0, "Time", ""}, {0, NULL, 0, NULL, NULL}}; - srna= RNA_def_struct(brna, "ID", NULL); + srna = RNA_def_struct(brna, "ID", NULL); RNA_def_struct_ui_text(srna, "ID", "Base type for datablocks, defining a unique name, linking from other libraries and garbage collection"); RNA_def_struct_flag(srna, STRUCT_ID|STRUCT_ID_REFCOUNT); RNA_def_struct_refine_func(srna, "rna_ID_refine"); RNA_def_struct_idprops_func(srna, "rna_ID_idprops"); - prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); + prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name"); RNA_def_property_string_funcs(prop, "rna_ID_name_get", "rna_ID_name_length", "rna_ID_name_set"); RNA_def_property_string_maxlength(prop, MAX_ID_NAME-2); @@ -473,55 +473,55 @@ static void rna_def_ID(BlenderRNA *brna) RNA_def_property_update(prop, NC_ID|NA_RENAME, NULL); RNA_def_struct_name_property(srna, prop); - prop= RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED); + prop = RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "us"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Users", "Number of times this datablock is referenced"); - prop= RNA_def_property(srna, "use_fake_user", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_fake_user", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_FAKEUSER); RNA_def_property_ui_text(prop, "Fake User", "Save this datablock even if it has no users"); RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_fake_user_set"); - prop= RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_DOIT); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); RNA_def_property_ui_text(prop, "Tag", "Tools can use this to tag data (initial state is undefined)"); - prop= RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_ID_RECALC); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Is Updated", "Datablock is tagged for recalculation"); - prop= RNA_def_property(srna, "is_updated_data", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "is_updated_data", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_ID_RECALC_DATA); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Is Updated Data", "Datablock data is tagged for recalculation"); - prop= RNA_def_property(srna, "library", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "library", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "lib"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Library", "Library file the datablock is linked from"); /* functions */ - func= RNA_def_function(srna, "copy", "rna_ID_copy"); + func = RNA_def_function(srna, "copy", "rna_ID_copy"); RNA_def_function_ui_description(func, "Create a copy of this datablock (not supported for all datablocks)"); - parm= RNA_def_pointer(func, "id", "ID", "", "New copy of the ID"); + parm = RNA_def_pointer(func, "id", "ID", "", "New copy of the ID"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "user_clear", "rna_ID_user_clear"); + func = RNA_def_function(srna, "user_clear", "rna_ID_user_clear"); RNA_def_function_ui_description(func, "Clear the user count of a datablock so its not saved, " "on reload the data will be removed"); - func= RNA_def_function(srna, "animation_data_create", "BKE_id_add_animdata"); + func = RNA_def_function(srna, "animation_data_create", "BKE_id_add_animdata"); RNA_def_function_ui_description(func, "Create animation data to this ID, note that not all ID types support this"); - parm= RNA_def_pointer(func, "anim_data", "AnimData", "", "New animation data or NULL"); + parm = RNA_def_pointer(func, "anim_data", "AnimData", "", "New animation data or NULL"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "animation_data_clear", "BKE_free_animdata"); + func = RNA_def_function(srna, "animation_data_clear", "BKE_free_animdata"); RNA_def_function_ui_description(func, "Clear animation on this this ID"); - func= RNA_def_function(srna, "update_tag", "rna_ID_update_tag"); + func = RNA_def_function(srna, "update_tag", "rna_ID_update_tag"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Tag the ID to update its display data"); RNA_def_enum_flag(func, "refresh", update_flag_items, 0, "", "Type of updates to perform"); @@ -532,16 +532,16 @@ static void rna_def_library(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - srna= RNA_def_struct(brna, "Library", "ID"); + srna = RNA_def_struct(brna, "Library", "ID"); RNA_def_struct_ui_text(srna, "Library", "External .blend file from which data is linked"); RNA_def_struct_ui_icon(srna, ICON_LIBRARY_DATA_DIRECT); - prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); + prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "File Path", "Path to the library .blend file"); RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Library_filepath_set"); - prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Library"); RNA_def_property_ui_text(prop, "Parent", ""); } @@ -550,11 +550,11 @@ void RNA_def_ID(BlenderRNA *brna) StructRNA *srna; /* built-in unknown type */ - srna= RNA_def_struct(brna, "UnknownType", NULL); + srna = RNA_def_struct(brna, "UnknownType", NULL); RNA_def_struct_ui_text(srna, "Unknown Type", "Stub RNA type used for pointers to unknown or internal data"); /* built-in any type */ - srna= RNA_def_struct(brna, "AnyType", NULL); + srna = RNA_def_struct(brna, "AnyType", NULL); RNA_def_struct_ui_text(srna, "Any Type", "RNA type used for pointers to any possible data"); rna_def_ID(brna); -- cgit v1.2.3 From 89a963fb7fdff543b77de790355b9dac3019bd33 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 9 Mar 2012 18:28:30 +0000 Subject: style cleanup: comment blocks --- source/blender/makesrna/intern/rna_ID.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source/blender/makesrna/intern/rna_ID.c') diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 6ca66f1d116..bb541471a19 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -262,11 +262,13 @@ ID *rna_ID_copy(ID *id) static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) { /* XXX, new function for this! */ - /*if (ob->type == OB_FONT) { +#if 0 + if (ob->type == OB_FONT) { Curve *cu = ob->data; freedisplist(&cu->disp); BKE_text_to_curve(sce, ob, CU_LEFT); - }*/ + } +#endif if (flag == 0) { /* pass */ @@ -281,12 +283,14 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) } break; /* Could add particle updates later */ -/* case ID_PA: +#if 0 + case ID_PA: if(flag & ~(OB_RECALC_ALL|PSYS_RECALC)) { BKE_report(reports, RPT_ERROR, "'refresh' incompatible with ParticleSettings ID type"); return; } - break; */ + break; +#endif default: BKE_report(reports, RPT_ERROR, "This ID type is not compatible with any 'refresh' options"); return; -- cgit v1.2.3