From 6c1da4d02288b4349c2753ddccf9f6a8e04e4c83 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 22 Sep 2012 14:07:55 +0000 Subject: code cleanup: make many functions static --- source/blender/makesrna/intern/rna_ID.c | 10 +- source/blender/makesrna/intern/rna_access.c | 4 +- source/blender/makesrna/intern/rna_actuator.c | 3 +- source/blender/makesrna/intern/rna_armature.c | 4 +- source/blender/makesrna/intern/rna_armature_api.c | 4 +- source/blender/makesrna/intern/rna_camera_api.c | 6 +- source/blender/makesrna/intern/rna_color.c | 4 +- source/blender/makesrna/intern/rna_controller.c | 2 +- source/blender/makesrna/intern/rna_curve.c | 6 +- source/blender/makesrna/intern/rna_fcurve.c | 4 +- source/blender/makesrna/intern/rna_gpencil.c | 2 +- source/blender/makesrna/intern/rna_image.c | 2 +- source/blender/makesrna/intern/rna_key.c | 2 +- source/blender/makesrna/intern/rna_main_api.c | 156 +++++++++++----------- source/blender/makesrna/intern/rna_mask.c | 4 +- source/blender/makesrna/intern/rna_mesh.c | 4 +- source/blender/makesrna/intern/rna_mesh_api.c | 4 +- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/makesrna/intern/rna_nla.c | 2 +- source/blender/makesrna/intern/rna_object.c | 4 +- source/blender/makesrna/intern/rna_object_api.c | 24 ++-- source/blender/makesrna/intern/rna_particle.c | 2 +- source/blender/makesrna/intern/rna_pose.c | 8 +- source/blender/makesrna/intern/rna_render.c | 8 +- source/blender/makesrna/intern/rna_scene_api.c | 2 +- source/blender/makesrna/intern/rna_screen.c | 4 +- source/blender/makesrna/intern/rna_sensor.c | 2 +- source/blender/makesrna/intern/rna_space.c | 4 +- source/blender/makesrna/intern/rna_texture_api.c | 10 +- source/blender/makesrna/intern/rna_tracking.c | 8 +- source/blender/makesrna/intern/rna_ui_api.c | 2 + source/blender/makesrna/intern/rna_wm.c | 2 +- source/blender/makesrna/intern/rna_wm_api.c | 4 +- 33 files changed, 160 insertions(+), 149 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 897e784c8e4..3ff63380491 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -256,7 +256,7 @@ StructRNA *rna_PropertyGroup_refine(PointerRNA *ptr) return ptr->type; } -ID *rna_ID_copy(ID *id) +static ID *rna_ID_copy(ID *id) { ID *newid; @@ -309,7 +309,7 @@ static void rna_ID_update_tag(ID *id, ReportList *reports, int flag) DAG_id_tag_update(id, flag); } -void rna_ID_user_clear(ID *id) +static void rna_ID_user_clear(ID *id) { id->us = 0; /* don't save */ id->flag &= ~LIB_FAKEUSER; @@ -341,7 +341,7 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig } } -void rna_IDMaterials_append_id(ID *id, Material *ma) +static void rna_IDMaterials_append_id(ID *id, Material *ma) { material_append_id(id, ma); @@ -349,7 +349,7 @@ void rna_IDMaterials_append_id(ID *id, Material *ma) WM_main_add_notifier(NC_OBJECT | ND_OB_SHADING, id); } -Material *rna_IDMaterials_pop_id(ID *id, int index_i, int remove_material_slot) +static Material *rna_IDMaterials_pop_id(ID *id, int index_i, int remove_material_slot) { Material *ma = material_pop_id(id, index_i, remove_material_slot); @@ -360,7 +360,7 @@ Material *rna_IDMaterials_pop_id(ID *id, int index_i, int remove_material_slot) return ma; } -void rna_Library_filepath_set(PointerRNA *ptr, const char *value) +static void rna_Library_filepath_set(PointerRNA *ptr, const char *value) { Library *lib = (Library *)ptr->data; BKE_library_filepath_set(lib, value); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4c1c377cb9f..c88944b4584 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -233,7 +233,7 @@ static void rna_idproperty_touch(IDProperty *idprop) } /* return a UI local ID prop definition for this prop */ -IDProperty *rna_idproperty_ui(PropertyRNA *prop) +static IDProperty *rna_idproperty_ui(PropertyRNA *prop) { IDProperty *idprop; @@ -618,7 +618,7 @@ PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier) } /* Find the property which uses the given nested struct */ -PropertyRNA *RNA_struct_find_nested(PointerRNA *ptr, StructRNA *srna) +static PropertyRNA *RNA_struct_find_nested(PointerRNA *ptr, StructRNA *srna) { PropertyRNA *prop = NULL; diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 2ee47d2d54b..12a41f213b7 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -29,6 +29,7 @@ #include "RNA_define.h" #include "RNA_access.h" +#include "RNA_enum_types.h" #include "rna_internal.h" #include "DNA_constraint_types.h" @@ -110,7 +111,7 @@ static StructRNA *rna_Actuator_refine(struct PointerRNA *ptr) } } -void rna_Actuator_name_set(PointerRNA *ptr, const char *value) +static void rna_Actuator_name_set(PointerRNA *ptr, const char *value) { bActuator *act = (bActuator *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index be70405d165..a645930f09a 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -100,7 +100,7 @@ static void rna_Armature_act_edit_bone_set(PointerRNA *ptr, PointerRNA value) } } -EditBone *rna_Armature_edit_bone_new(bArmature *arm, ReportList *reports, const char *name) +static EditBone *rna_Armature_edit_bone_new(bArmature *arm, ReportList *reports, const char *name) { if (arm->edbo == NULL) { BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in editmode, cant add an editbone", arm->id.name + 2); @@ -109,7 +109,7 @@ EditBone *rna_Armature_edit_bone_new(bArmature *arm, ReportList *reports, const return ED_armature_edit_bone_add(arm, name); } -void rna_Armature_edit_bone_remove(bArmature *arm, ReportList *reports, EditBone *ebone) +static void rna_Armature_edit_bone_remove(bArmature *arm, ReportList *reports, EditBone *ebone) { if (arm->edbo == NULL) { BKE_reportf(reports, RPT_ERROR, "Armature '%s' not in editmode, cant remove an editbone", arm->id.name + 2); diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c index b7ea642cb8b..96c5350e5b7 100644 --- a/source/blender/makesrna/intern/rna_armature_api.c +++ b/source/blender/makesrna/intern/rna_armature_api.c @@ -44,12 +44,12 @@ #include "BKE_armature.h" -void rna_EditBone_align_roll(EditBone *ebo, float no[3]) +static void rna_EditBone_align_roll(EditBone *ebo, float no[3]) { ebo->roll = ED_rollBoneToVector(ebo, no, FALSE); } -float rna_Bone_do_envelope(Bone *bone, float *vec) +static float rna_Bone_do_envelope(Bone *bone, float *vec) { float scale = (bone->flag & BONE_MULT_VG_ENV) == BONE_MULT_VG_ENV ? bone->weight : 1.0f; return distfactor_to_bone(vec, bone->arm_head, bone->arm_tail, bone->rad_head * scale, diff --git a/source/blender/makesrna/intern/rna_camera_api.c b/source/blender/makesrna/intern/rna_camera_api.c index 75941fa224f..bf916806e40 100644 --- a/source/blender/makesrna/intern/rna_camera_api.c +++ b/source/blender/makesrna/intern/rna_camera_api.c @@ -31,6 +31,8 @@ #include "RNA_define.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include "DNA_scene_types.h" @@ -39,8 +41,8 @@ #include "BKE_context.h" #include "BKE_object.h" -void rna_camera_view_frame(struct Camera *camera, struct Scene *scene, - float vec1_r[3], float vec2_r[3], float vec3_r[3], float vec4_r[3]) +static void rna_camera_view_frame(struct Camera *camera, struct Scene *scene, + float vec1_r[3], float vec2_r[3], float vec3_r[3], float vec4_r[3]) { float vec[4][3]; diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index e7b09506ab4..2e9866ee428 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -314,7 +314,7 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA * } } -void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4]) +static void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4]) { do_colorband(coba, position, color); } @@ -498,7 +498,7 @@ static void rna_ColorManagement_update(Main *UNUSED(bmain), Scene *UNUSED(scene) } /* this function only exists because #curvemap_evaluateF uses a 'const' qualifier */ -float rna_CurveMap_evaluateF(struct CurveMap *cuma, float value) +static float rna_CurveMap_evaluateF(struct CurveMap *cuma, float value) { return curvemap_evaluateF(cuma, value); } diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index 44c8a2b412b..aef1f765fe2 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -77,7 +77,7 @@ static StructRNA *rna_Controller_refine(struct PointerRNA *ptr) } } -void rna_Constroller_name_set(PointerRNA *ptr, const char *value) +static void rna_Constroller_name_set(PointerRNA *ptr, const char *value) { bController *cont = (bController *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index b2a2bab0f4b..c47cb8ef2af 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -432,20 +432,20 @@ static void rna_Curve_offset_set(PointerRNA *ptr, float value) } /* name functions that ignore the first two ID characters */ -void rna_Curve_body_get(PointerRNA *ptr, char *value) +static void rna_Curve_body_get(PointerRNA *ptr, char *value) { Curve *cu = (Curve *)ptr->id.data; BLI_strncpy(value, cu->str, cu->len + 1); } -int rna_Curve_body_length(PointerRNA *ptr) +static int rna_Curve_body_length(PointerRNA *ptr) { Curve *cu = (Curve *)ptr->id.data; return cu->len; } /* TODO - check UTF & python play nice */ -void rna_Curve_body_set(PointerRNA *ptr, const char *value) +static void rna_Curve_body_set(PointerRNA *ptr, const char *value) { int len = strlen(value); Curve *cu = (Curve *)ptr->id.data; diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index a0d64723a5c..24b14fdb884 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -403,13 +403,13 @@ static void rna_FCurve_group_set(PointerRNA *ptr, PointerRNA value) } } -DriverVar *rna_Driver_new_variable(ChannelDriver *driver) +static DriverVar *rna_Driver_new_variable(ChannelDriver *driver) { /* call the API function for this */ return driver_add_new_variable(driver); } -void rna_Driver_remove_variable(ChannelDriver *driver, ReportList *reports, DriverVar *dvar) +static void rna_Driver_remove_variable(ChannelDriver *driver, ReportList *reports, DriverVar *dvar) { if (BLI_findindex(&driver->variables, dvar) == -1) { BKE_report(reports, RPT_ERROR, "Variable does not exist in this driver"); diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index eb12a02aa99..131611d3002 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -90,7 +90,7 @@ static void rna_GPencil_active_layer_set(PointerRNA *ptr, PointerRNA value) } } -void rna_GPencilLayer_info_set(PointerRNA *ptr, const char *value) +static void rna_GPencilLayer_info_set(PointerRNA *ptr, const char *value) { bGPdata *gpd = ptr->id.data; bGPDlayer *gpl = ptr->data; diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 6c8a3d2df1b..fdab874cf01 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -147,7 +147,7 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA * } -char *rna_ImageUser_path(PointerRNA *ptr) +static char *rna_ImageUser_path(PointerRNA *ptr) { if (ptr->id.data) { /* ImageUser *iuser= ptr->data; */ diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 0d6594d7fcb..33bbaeec282 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -66,7 +66,7 @@ static Key *rna_ShapeKey_find_key(ID *id) } } -void rna_ShapeKey_name_set(PointerRNA *ptr, const char *value) +static void rna_ShapeKey_name_set(PointerRNA *ptr, const char *value) { KeyBlock *kb = ptr->data; char oldname[sizeof(kb->name)]; diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 37cf780b762..42f8ea2d796 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -95,13 +95,13 @@ #include "ED_screen.h" -Camera *rna_Main_cameras_new(Main *UNUSED(bmain), const char *name) +static Camera *rna_Main_cameras_new(Main *UNUSED(bmain), const char *name) { ID *id = BKE_camera_add(name); id_us_min(id); return (Camera *)id; } -void rna_Main_cameras_remove(Main *bmain, ReportList *reports, struct Camera *camera) +static void rna_Main_cameras_remove(Main *bmain, ReportList *reports, struct Camera *camera) { if (ID_REAL_USERS(camera) <= 0) BKE_libblock_free(&bmain->camera, camera); @@ -112,11 +112,11 @@ void rna_Main_cameras_remove(Main *bmain, ReportList *reports, struct Camera *ca /* XXX python now has invalid pointer? */ } -Scene *rna_Main_scenes_new(Main *UNUSED(bmain), const char *name) +static Scene *rna_Main_scenes_new(Main *UNUSED(bmain), const char *name) { return BKE_scene_add(name); } -void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports, struct Scene *scene) +static void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports, struct Scene *scene) { /* don't call BKE_libblock_free(...) directly */ Scene *newscene; @@ -136,7 +136,7 @@ void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports, struc BKE_scene_unlink(bmain, scene, newscene); } -Object *rna_Main_objects_new(Main *UNUSED(bmain), ReportList *reports, const char *name, ID *data) +static Object *rna_Main_objects_new(Main *UNUSED(bmain), ReportList *reports, const char *name, ID *data) { Object *ob; int type = OB_EMPTY; @@ -190,7 +190,7 @@ Object *rna_Main_objects_new(Main *UNUSED(bmain), ReportList *reports, const cha return ob; } -void rna_Main_objects_remove(Main *bmain, ReportList *reports, struct Object *object) +static void rna_Main_objects_remove(Main *bmain, ReportList *reports, struct Object *object) { if (ID_REAL_USERS(object) <= 0) { BKE_object_unlink(object); /* needed or ID pointers to this are not cleared */ @@ -202,13 +202,13 @@ void rna_Main_objects_remove(Main *bmain, ReportList *reports, struct Object *ob } } -Material *rna_Main_materials_new(Main *UNUSED(bmain), const char *name) +static Material *rna_Main_materials_new(Main *UNUSED(bmain), const char *name) { ID *id = (ID *)BKE_material_add(name); id_us_min(id); return (Material *)id; } -void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material *material) +static void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material *material) { if (ID_REAL_USERS(material) <= 0) BKE_libblock_free(&bmain->mat, material); @@ -219,14 +219,14 @@ void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material /* XXX python now has invalid pointer? */ } -bNodeTree *rna_Main_nodetree_new(Main *UNUSED(bmain), const char *name, int type) +static bNodeTree *rna_Main_nodetree_new(Main *UNUSED(bmain), const char *name, int type) { bNodeTree *tree = ntreeAddTree(name, type, NODE_GROUP); id_us_min(&tree->id); return tree; } -void rna_Main_nodetree_remove(Main *bmain, ReportList *reports, struct bNodeTree *tree) +static void rna_Main_nodetree_remove(Main *bmain, ReportList *reports, struct bNodeTree *tree) { if (ID_REAL_USERS(tree) <= 0) BKE_libblock_free(&bmain->nodetree, tree); @@ -237,13 +237,13 @@ void rna_Main_nodetree_remove(Main *bmain, ReportList *reports, struct bNodeTree /* XXX python now has invalid pointer? */ } -Mesh *rna_Main_meshes_new(Main *UNUSED(bmain), const char *name) +static Mesh *rna_Main_meshes_new(Main *UNUSED(bmain), const char *name) { Mesh *me = BKE_mesh_add(name); id_us_min(&me->id); return me; } -void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh) +static void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh) { if (ID_REAL_USERS(mesh) <= 0) BKE_libblock_free(&bmain->mesh, mesh); @@ -254,14 +254,14 @@ void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh) /* XXX python now has invalid pointer? */ } -Lamp *rna_Main_lamps_new(Main *UNUSED(bmain), const char *name, int type) +static Lamp *rna_Main_lamps_new(Main *UNUSED(bmain), const char *name, int type) { Lamp *lamp = BKE_lamp_add(name); lamp->type = type; id_us_min(&lamp->id); return lamp; } -void rna_Main_lamps_remove(Main *bmain, ReportList *reports, Lamp *lamp) +static void rna_Main_lamps_remove(Main *bmain, ReportList *reports, Lamp *lamp) { if (ID_REAL_USERS(lamp) <= 0) BKE_libblock_free(&bmain->lamp, lamp); @@ -272,14 +272,14 @@ void rna_Main_lamps_remove(Main *bmain, ReportList *reports, Lamp *lamp) /* XXX python now has invalid pointer? */ } -Image *rna_Main_images_new(Main *UNUSED(bmain), const char *name, int width, int height, int alpha, int float_buffer) +static Image *rna_Main_images_new(Main *UNUSED(bmain), const char *name, int width, int height, int alpha, int float_buffer) { float color[4] = {0.0, 0.0, 0.0, 1.0}; Image *image = BKE_image_add_generated(width, height, name, alpha ? 32 : 24, float_buffer, 0, color); id_us_min(&image->id); return image; } -Image *rna_Main_images_load(Main *UNUSED(bmain), ReportList *reports, const char *filepath) +static Image *rna_Main_images_load(Main *UNUSED(bmain), ReportList *reports, const char *filepath) { Image *ima; @@ -292,7 +292,7 @@ Image *rna_Main_images_load(Main *UNUSED(bmain), ReportList *reports, const char return ima; } -void rna_Main_images_remove(Main *bmain, ReportList *reports, Image *image) +static void rna_Main_images_remove(Main *bmain, ReportList *reports, Image *image) { if (ID_REAL_USERS(image) <= 0) BKE_libblock_free(&bmain->image, image); @@ -303,13 +303,13 @@ void rna_Main_images_remove(Main *bmain, ReportList *reports, Image *image) /* XXX python now has invalid pointer? */ } -Lattice *rna_Main_lattices_new(Main *UNUSED(bmain), const char *name) +static Lattice *rna_Main_lattices_new(Main *UNUSED(bmain), const char *name) { Lattice *lt = BKE_lattice_add(name); id_us_min(<->id); return lt; } -void rna_Main_lattices_remove(Main *bmain, ReportList *reports, struct Lattice *lt) +static void rna_Main_lattices_remove(Main *bmain, ReportList *reports, struct Lattice *lt) { if (ID_REAL_USERS(lt) <= 0) BKE_libblock_free(&bmain->latt, lt); @@ -318,13 +318,13 @@ void rna_Main_lattices_remove(Main *bmain, ReportList *reports, struct Lattice * lt->id.name + 2, ID_REAL_USERS(lt)); } -Curve *rna_Main_curves_new(Main *UNUSED(bmain), const char *name, int type) +static Curve *rna_Main_curves_new(Main *UNUSED(bmain), const char *name, int type) { Curve *cu = BKE_curve_add(name, type); id_us_min(&cu->id); return cu; } -void rna_Main_curves_remove(Main *bmain, ReportList *reports, struct Curve *cu) +static void rna_Main_curves_remove(Main *bmain, ReportList *reports, struct Curve *cu) { if (ID_REAL_USERS(cu) <= 0) BKE_libblock_free(&bmain->curve, cu); @@ -333,13 +333,13 @@ void rna_Main_curves_remove(Main *bmain, ReportList *reports, struct Curve *cu) cu->id.name + 2, ID_REAL_USERS(cu)); } -MetaBall *rna_Main_metaballs_new(Main *UNUSED(bmain), const char *name) +static MetaBall *rna_Main_metaballs_new(Main *UNUSED(bmain), const char *name) { MetaBall *mb = BKE_mball_add(name); id_us_min(&mb->id); return mb; } -void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall *mb) +static void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall *mb) { if (ID_REAL_USERS(mb) <= 0) BKE_libblock_free(&bmain->mball, mb); @@ -348,7 +348,7 @@ void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall mb->id.name + 2, ID_REAL_USERS(mb)); } -VFont *rna_Main_fonts_load(Main *bmain, ReportList *reports, const char *filepath) +static VFont *rna_Main_fonts_load(Main *bmain, ReportList *reports, const char *filepath) { VFont *font; @@ -362,7 +362,7 @@ VFont *rna_Main_fonts_load(Main *bmain, ReportList *reports, const char *filepat return font; } -void rna_Main_fonts_remove(Main *bmain, ReportList *reports, VFont *vfont) +static void rna_Main_fonts_remove(Main *bmain, ReportList *reports, VFont *vfont) { if (ID_REAL_USERS(vfont) <= 0) BKE_libblock_free(&bmain->vfont, vfont); @@ -373,14 +373,14 @@ void rna_Main_fonts_remove(Main *bmain, ReportList *reports, VFont *vfont) /* XXX python now has invalid pointer? */ } -Tex *rna_Main_textures_new(Main *UNUSED(bmain), const char *name, int type) +static Tex *rna_Main_textures_new(Main *UNUSED(bmain), const char *name, int type) { Tex *tex = add_texture(name); tex_set_type(tex, type); id_us_min(&tex->id); return tex; } -void rna_Main_textures_remove(Main *bmain, ReportList *reports, struct Tex *tex) +static void rna_Main_textures_remove(Main *bmain, ReportList *reports, struct Tex *tex) { if (ID_REAL_USERS(tex) <= 0) BKE_libblock_free(&bmain->tex, tex); @@ -389,13 +389,13 @@ void rna_Main_textures_remove(Main *bmain, ReportList *reports, struct Tex *tex) tex->id.name + 2, ID_REAL_USERS(tex)); } -Brush *rna_Main_brushes_new(Main *UNUSED(bmain), const char *name) +static Brush *rna_Main_brushes_new(Main *UNUSED(bmain), const char *name) { Brush *brush = BKE_brush_add(name); id_us_min(&brush->id); return brush; } -void rna_Main_brushes_remove(Main *bmain, ReportList *reports, struct Brush *brush) +static void rna_Main_brushes_remove(Main *bmain, ReportList *reports, struct Brush *brush) { if (ID_REAL_USERS(brush) <= 0) BKE_libblock_free(&bmain->brush, brush); @@ -404,13 +404,13 @@ void rna_Main_brushes_remove(Main *bmain, ReportList *reports, struct Brush *bru brush->id.name + 2, ID_REAL_USERS(brush)); } -World *rna_Main_worlds_new(Main *UNUSED(bmain), const char *name) +static World *rna_Main_worlds_new(Main *UNUSED(bmain), const char *name) { World *world = add_world(name); id_us_min(&world->id); return world; } -void rna_Main_worlds_remove(Main *bmain, ReportList *reports, struct World *world) +static void rna_Main_worlds_remove(Main *bmain, ReportList *reports, struct World *world) { if (ID_REAL_USERS(world) <= 0) BKE_libblock_free(&bmain->world, world); @@ -419,24 +419,24 @@ void rna_Main_worlds_remove(Main *bmain, ReportList *reports, struct World *worl world->id.name + 2, ID_REAL_USERS(world)); } -Group *rna_Main_groups_new(Main *UNUSED(bmain), const char *name) +static Group *rna_Main_groups_new(Main *UNUSED(bmain), const char *name) { return add_group(name); } -void rna_Main_groups_remove(Main *bmain, Group *group) +static void rna_Main_groups_remove(Main *bmain, Group *group) { BKE_group_unlink(group); BKE_libblock_free(&bmain->group, group); /* XXX python now has invalid pointer? */ } -Speaker *rna_Main_speakers_new(Main *UNUSED(bmain), const char *name) +static Speaker *rna_Main_speakers_new(Main *UNUSED(bmain), const char *name) { Speaker *speaker = BKE_speaker_add(name); id_us_min(&speaker->id); return speaker; } -void rna_Main_speakers_remove(Main *bmain, ReportList *reports, Speaker *speaker) +static void rna_Main_speakers_remove(Main *bmain, ReportList *reports, Speaker *speaker) { if (ID_REAL_USERS(speaker) <= 0) BKE_libblock_free(&bmain->speaker, speaker); @@ -447,18 +447,18 @@ void rna_Main_speakers_remove(Main *bmain, ReportList *reports, Speaker *speaker /* XXX python now has invalid pointer? */ } -Text *rna_Main_texts_new(Main *UNUSED(bmain), const char *name) +static Text *rna_Main_texts_new(Main *UNUSED(bmain), const char *name) { return BKE_text_add(name); } -void rna_Main_texts_remove(Main *bmain, Text *text) +static void rna_Main_texts_remove(Main *bmain, Text *text) { BKE_text_unlink(bmain, text); BKE_libblock_free(&bmain->text, text); /* XXX python now has invalid pointer? */ } -Text *rna_Main_texts_load(Main *bmain, ReportList *reports, const char *filepath) +static Text *rna_Main_texts_load(Main *bmain, ReportList *reports, const char *filepath) { Text *txt; @@ -472,13 +472,13 @@ Text *rna_Main_texts_load(Main *bmain, ReportList *reports, const char *filepath return txt; } -bArmature *rna_Main_armatures_new(Main *UNUSED(bmain), const char *name) +static bArmature *rna_Main_armatures_new(Main *UNUSED(bmain), const char *name) { bArmature *arm = BKE_armature_add(name); id_us_min(&arm->id); return arm; } -void rna_Main_armatures_remove(Main *bmain, ReportList *reports, bArmature *arm) +static void rna_Main_armatures_remove(Main *bmain, ReportList *reports, bArmature *arm) { if (ID_REAL_USERS(arm) <= 0) BKE_libblock_free(&bmain->armature, arm); @@ -489,14 +489,14 @@ void rna_Main_armatures_remove(Main *bmain, ReportList *reports, bArmature *arm) /* XXX python now has invalid pointer? */ } -bAction *rna_Main_actions_new(Main *UNUSED(bmain), const char *name) +static bAction *rna_Main_actions_new(Main *UNUSED(bmain), const char *name) { bAction *act = add_empty_action(name); id_us_min(&act->id); act->id.flag &= ~LIB_FAKEUSER; return act; } -void rna_Main_actions_remove(Main *bmain, ReportList *reports, bAction *act) +static void rna_Main_actions_remove(Main *bmain, ReportList *reports, bAction *act) { if (ID_REAL_USERS(act) <= 0) BKE_libblock_free(&bmain->action, act); @@ -507,13 +507,13 @@ void rna_Main_actions_remove(Main *bmain, ReportList *reports, bAction *act) /* XXX python now has invalid pointer? */ } -ParticleSettings *rna_Main_particles_new(Main *bmain, const char *name) +static ParticleSettings *rna_Main_particles_new(Main *bmain, const char *name) { ParticleSettings *part = psys_new_settings(name, bmain); id_us_min(&part->id); return part; } -void rna_Main_particles_remove(Main *bmain, ReportList *reports, ParticleSettings *part) +static void rna_Main_particles_remove(Main *bmain, ReportList *reports, ParticleSettings *part) { if (ID_REAL_USERS(part) <= 0) BKE_libblock_free(&bmain->particle, part); @@ -524,7 +524,7 @@ void rna_Main_particles_remove(Main *bmain, ReportList *reports, ParticleSetting /* XXX python now has invalid pointer? */ } -MovieClip *rna_Main_movieclip_load(Main *UNUSED(bmain), ReportList *reports, const char *filepath) +static MovieClip *rna_Main_movieclip_load(Main *UNUSED(bmain), ReportList *reports, const char *filepath) { MovieClip *clip; @@ -538,14 +538,14 @@ MovieClip *rna_Main_movieclip_load(Main *UNUSED(bmain), ReportList *reports, con return clip; } -void rna_Main_movieclips_remove(Main *bmain, MovieClip *clip) +static void rna_Main_movieclips_remove(Main *bmain, MovieClip *clip) { BKE_movieclip_unlink(bmain, clip); BKE_libblock_free(&bmain->movieclip, clip); /* XXX python now has invalid pointer? */ } -Mask *rna_Main_mask_new(Main *UNUSED(bmain), const char *name) +static Mask *rna_Main_mask_new(Main *UNUSED(bmain), const char *name) { Mask *mask; @@ -554,7 +554,7 @@ Mask *rna_Main_mask_new(Main *UNUSED(bmain), const char *name) return mask; } -void rna_Main_masks_remove(Main *bmain, Mask *mask) +static void rna_Main_masks_remove(Main *bmain, Mask *mask) { BKE_mask_free(bmain, mask); BKE_libblock_free(&bmain->mask, mask); @@ -562,36 +562,36 @@ void rna_Main_masks_remove(Main *bmain, Mask *mask) } /* tag functions, all the same */ -void rna_Main_cameras_tag(Main *bmain, int value) { tag_main_lb(&bmain->camera, value); } -void rna_Main_scenes_tag(Main *bmain, int value) { tag_main_lb(&bmain->scene, value); } -void rna_Main_objects_tag(Main *bmain, int value) { tag_main_lb(&bmain->object, value); } -void rna_Main_materials_tag(Main *bmain, int value) { tag_main_lb(&bmain->mat, value); } -void rna_Main_node_groups_tag(Main *bmain, int value) { tag_main_lb(&bmain->nodetree, value); } -void rna_Main_meshes_tag(Main *bmain, int value) { tag_main_lb(&bmain->mesh, value); } -void rna_Main_lamps_tag(Main *bmain, int value) { tag_main_lb(&bmain->lamp, value); } -void rna_Main_libraries_tag(Main *bmain, int value) { tag_main_lb(&bmain->library, value); } -void rna_Main_screens_tag(Main *bmain, int value) { tag_main_lb(&bmain->screen, value); } -void rna_Main_window_managers_tag(Main *bmain, int value) { tag_main_lb(&bmain->wm, value); } -void rna_Main_images_tag(Main *bmain, int value) { tag_main_lb(&bmain->image, value); } -void rna_Main_lattices_tag(Main *bmain, int value) { tag_main_lb(&bmain->latt, value); } -void rna_Main_curves_tag(Main *bmain, int value) { tag_main_lb(&bmain->curve, value); } -void rna_Main_metaballs_tag(Main *bmain, int value) { tag_main_lb(&bmain->mball, value); } -void rna_Main_fonts_tag(Main *bmain, int value) { tag_main_lb(&bmain->vfont, value); } -void rna_Main_textures_tag(Main *bmain, int value) { tag_main_lb(&bmain->tex, value); } -void rna_Main_brushes_tag(Main *bmain, int value) { tag_main_lb(&bmain->brush, value); } -void rna_Main_worlds_tag(Main *bmain, int value) { tag_main_lb(&bmain->world, value); } -void rna_Main_groups_tag(Main *bmain, int value) { tag_main_lb(&bmain->group, value); } -void rna_Main_shape_keys_tag(Main *bmain, int value) { tag_main_lb(&bmain->key, value); } -void rna_Main_scripts_tag(Main *bmain, int value) { tag_main_lb(&bmain->script, value); } -void rna_Main_texts_tag(Main *bmain, int value) { tag_main_lb(&bmain->text, value); } -void rna_Main_speakers_tag(Main *bmain, int value) { tag_main_lb(&bmain->speaker, value); } -void rna_Main_sounds_tag(Main *bmain, int value) { tag_main_lb(&bmain->sound, value); } -void rna_Main_armatures_tag(Main *bmain, int value) { tag_main_lb(&bmain->armature, value); } -void rna_Main_actions_tag(Main *bmain, int value) { tag_main_lb(&bmain->action, value); } -void rna_Main_particles_tag(Main *bmain, int value) { tag_main_lb(&bmain->particle, value); } -void rna_Main_gpencil_tag(Main *bmain, int value) { tag_main_lb(&bmain->gpencil, value); } -void rna_Main_movieclips_tag(Main *bmain, int value) { tag_main_lb(&bmain->movieclip, value); } -void rna_Main_masks_tag(Main *bmain, int value) { tag_main_lb(&bmain->mask, value); } +static void rna_Main_cameras_tag(Main *bmain, int value) { tag_main_lb(&bmain->camera, value); } +static void rna_Main_scenes_tag(Main *bmain, int value) { tag_main_lb(&bmain->scene, value); } +static void rna_Main_objects_tag(Main *bmain, int value) { tag_main_lb(&bmain->object, value); } +static void rna_Main_materials_tag(Main *bmain, int value) { tag_main_lb(&bmain->mat, value); } +static void rna_Main_node_groups_tag(Main *bmain, int value) { tag_main_lb(&bmain->nodetree, value); } +static void rna_Main_meshes_tag(Main *bmain, int value) { tag_main_lb(&bmain->mesh, value); } +static void rna_Main_lamps_tag(Main *bmain, int value) { tag_main_lb(&bmain->lamp, value); } +static void rna_Main_libraries_tag(Main *bmain, int value) { tag_main_lb(&bmain->library, value); } +static void rna_Main_screens_tag(Main *bmain, int value) { tag_main_lb(&bmain->screen, value); } +static void rna_Main_window_managers_tag(Main *bmain, int value) { tag_main_lb(&bmain->wm, value); } +static void rna_Main_images_tag(Main *bmain, int value) { tag_main_lb(&bmain->image, value); } +static void rna_Main_lattices_tag(Main *bmain, int value) { tag_main_lb(&bmain->latt, value); } +static void rna_Main_curves_tag(Main *bmain, int value) { tag_main_lb(&bmain->curve, value); } +static void rna_Main_metaballs_tag(Main *bmain, int value) { tag_main_lb(&bmain->mball, value); } +static void rna_Main_fonts_tag(Main *bmain, int value) { tag_main_lb(&bmain->vfont, value); } +static void rna_Main_textures_tag(Main *bmain, int value) { tag_main_lb(&bmain->tex, value); } +static void rna_Main_brushes_tag(Main *bmain, int value) { tag_main_lb(&bmain->brush, value); } +static void rna_Main_worlds_tag(Main *bmain, int value) { tag_main_lb(&bmain->world, value); } +static void rna_Main_groups_tag(Main *bmain, int value) { tag_main_lb(&bmain->group, value); } +static void rna_Main_shape_keys_tag(Main *bmain, int value) { tag_main_lb(&bmain->key, value); } +static void rna_Main_scripts_tag(Main *bmain, int value) { tag_main_lb(&bmain->script, value); } +static void rna_Main_texts_tag(Main *bmain, int value) { tag_main_lb(&bmain->text, value); } +static void rna_Main_speakers_tag(Main *bmain, int value) { tag_main_lb(&bmain->speaker, value); } +static void rna_Main_sounds_tag(Main *bmain, int value) { tag_main_lb(&bmain->sound, value); } +static void rna_Main_armatures_tag(Main *bmain, int value) { tag_main_lb(&bmain->armature, value); } +static void rna_Main_actions_tag(Main *bmain, int value) { tag_main_lb(&bmain->action, value); } +static void rna_Main_particles_tag(Main *bmain, int value) { tag_main_lb(&bmain->particle, value); } +static void rna_Main_gpencil_tag(Main *bmain, int value) { tag_main_lb(&bmain->gpencil, value); } +static void rna_Main_movieclips_tag(Main *bmain, int value) { tag_main_lb(&bmain->movieclip, value); } +static void rna_Main_masks_tag(Main *bmain, int value) { tag_main_lb(&bmain->mask, value); } static int rna_Main_cameras_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_CA); } static int rna_Main_scenes_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_SCE); } diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 719baed8edb..97d9cc961ef 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -193,7 +193,7 @@ static void rna_MaskLayer_splines_begin(CollectionPropertyIterator *iter, Pointe rna_iterator_listbase_begin(iter, &masklay->splines, NULL); } -void rna_MaskLayer_name_set(PointerRNA *ptr, const char *value) +static void rna_MaskLayer_name_set(PointerRNA *ptr, const char *value) { Mask *mask = (Mask *)ptr->id.data; MaskLayer *masklay = (MaskLayer *)ptr->data; @@ -315,7 +315,7 @@ static MaskLayer *rna_Mask_layers_new(Mask *mask, const char *name) return masklay; } -void rna_Mask_layers_remove(Mask *mask, ReportList *reports, MaskLayer *masklay) +static void rna_Mask_layers_remove(Mask *mask, ReportList *reports, MaskLayer *masklay) { if (BLI_findindex(&mask->masklayers, masklay) == -1) { BKE_reportf(reports, RPT_ERROR, "MaskLayer '%s' not found in mask '%s'", masklay->name, mask->id.name + 2); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 74c4dab4392..a2212eab729 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -149,7 +149,7 @@ void rna_Mesh_update_draw(Main *bmain, Scene *scene, PointerRNA *ptr) } -void rna_Mesh_update_vertmask(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_Mesh_update_vertmask(Main *bmain, Scene *scene, PointerRNA *ptr) { Mesh *me = ptr->data; if ((me->editflag & ME_EDIT_VERT_SEL) && (me->editflag & ME_EDIT_PAINT_MASK)) { @@ -158,7 +158,7 @@ void rna_Mesh_update_vertmask(Main *bmain, Scene *scene, PointerRNA *ptr) rna_Mesh_update_draw(bmain, scene, ptr); } -void rna_Mesh_update_facemask(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_Mesh_update_facemask(Main *bmain, Scene *scene, PointerRNA *ptr) { Mesh *me = ptr->data; if ((me->editflag & ME_EDIT_VERT_SEL) && (me->editflag & ME_EDIT_PAINT_MASK)) { diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index fe18e6254d0..b63390c65ed 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -41,8 +41,10 @@ #include "BKE_mesh.h" #include "ED_mesh.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME -const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, bContext *C, struct Mesh *mesh2) +static const char *rna_Mesh_unit_test_compare(struct Mesh *mesh, bContext *C, struct Mesh *mesh2) { const char *ret = BKE_mesh_cmp(mesh, mesh2, FLT_EPSILON * 60); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d64e004e9ff..eb4660c18e8 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -215,7 +215,7 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr) } } -void rna_Modifier_name_set(PointerRNA *ptr, const char *value) +static void rna_Modifier_name_set(PointerRNA *ptr, const char *value) { ModifierData *md = ptr->data; char oldname[sizeof(md->name)]; diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 16753961852..6e0f9f37d17 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -360,7 +360,7 @@ static void rna_NlaStrip_remove(NlaTrack *track, bContext *C, ReportList *report /* Set the 'solo' setting for the given NLA-track, making sure that it is the only one * that has this status in its AnimData block. */ -void rna_NlaTrack_solo_set(PointerRNA *ptr, int value) +static void rna_NlaTrack_solo_set(PointerRNA *ptr, int value) { NlaTrack *data = (NlaTrack *)ptr->data; AnimData *adt = BKE_animdata_from_id(ptr->id.data); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index df209816fec..a10c153515a 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -231,7 +231,7 @@ void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data); } -void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr) { Object *ob = ptr->id.data; @@ -496,7 +496,7 @@ static void rna_Object_dup_group_set(PointerRNA *ptr, PointerRNA value) "Cannot set dupli-group as object belongs in group being instanced thus causing a cycle"); } -void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value) +static void rna_VertexGroup_name_set(PointerRNA *ptr, const char *value) { Object *ob = (Object *)ptr->id.data; bDeformGroup *dg = (bDeformGroup *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 5bf1cc281ad..5aadbfa7269 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -39,6 +39,8 @@ #include "DNA_object_types.h" #include "DNA_modifier_types.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include "BLI_math.h" @@ -72,7 +74,7 @@ /* copied from Mesh_getFromObject and adapted to RNA interface */ /* settings: 0 - preview, 1 - render */ -Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_modifiers, int settings) +static Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_modifiers, int settings) { Mesh *tmpmesh; Curve *tmpcu = NULL, *copycu; @@ -335,7 +337,7 @@ static void dupli_render_particle_set(Scene *scene, Object *ob, int level, int e dupli_render_particle_set(scene, go->ob, level + 1, enable); } /* When no longer needed, duplilist should be freed with Object.free_duplilist */ -void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce) +static void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce) { if (!(ob->transflag & OB_DUPLI)) { BKE_report(reports, RPT_ERROR, "Object does not have duplis"); @@ -357,7 +359,7 @@ void rna_Object_create_duplilist(Object *ob, ReportList *reports, Scene *sce) /* ob->duplilist should now be freed with Object.free_duplilist */ } -void rna_Object_free_duplilist(Object *ob) +static void rna_Object_free_duplilist(Object *ob) { if (ob->duplilist) { free_object_duplilist(ob->duplilist); @@ -385,7 +387,7 @@ static PointerRNA rna_Object_shape_key_add(Object *ob, bContext *C, ReportList * } } -int rna_Object_is_visible(Object *ob, Scene *sce) +static int rna_Object_is_visible(Object *ob, Scene *sce) { return !(ob->restrictflag & OB_RESTRICT_VIEW) && (ob->lay & sce->lay); } @@ -428,8 +430,8 @@ static void rna_Mesh_assign_verts_to_group(Object *ob, bDeformGroup *group, int #endif /* BMESH_TODO, return polygon index, not tessface */ -void rna_Object_ray_cast(Object *ob, ReportList *reports, float ray_start[3], float ray_end[3], - float r_location[3], float r_normal[3], int *index) +static void rna_Object_ray_cast(Object *ob, ReportList *reports, float ray_start[3], float ray_end[3], + float r_location[3], float r_normal[3], int *index) { BVHTreeFromMesh treeData = {NULL}; @@ -470,8 +472,8 @@ void rna_Object_ray_cast(Object *ob, ReportList *reports, float ray_start[3], fl *index = -1; } -void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float point_co[3], float max_dist, - float n_location[3], float n_normal[3], int *index) +static void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float point_co[3], float max_dist, + float n_location[3], float n_normal[3], int *index) { BVHTreeFromMesh treeData = {NULL}; @@ -510,17 +512,17 @@ void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float poi /* ObjectBase */ -void rna_ObjectBase_layers_from_view(Base *base, View3D *v3d) +static void rna_ObjectBase_layers_from_view(Base *base, View3D *v3d) { base->lay = base->object->lay = v3d->lay; } -int rna_Object_is_modified(Object *ob, Scene *scene, int settings) +static int rna_Object_is_modified(Object *ob, Scene *scene, int settings) { return BKE_object_is_modified(scene, ob) & settings; } -int rna_Object_is_deform_modified(Object *ob, Scene *scene, int settings) +static int rna_Object_is_deform_modified(Object *ob, Scene *scene, int settings) { return BKE_object_is_deform_modified(scene, ob) & settings; } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index fc3dfafe133..89638389fd2 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -502,7 +502,7 @@ static int rna_PartSettings_is_fluid_get(PointerRNA *ptr) return part->type == PART_FLUID; } -void rna_ParticleSystem_name_set(PointerRNA *ptr, const char *value) +static void rna_ParticleSystem_name_set(PointerRNA *ptr, const char *value) { Object *ob = ptr->id.data; ParticleSystem *part = (ParticleSystem *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 06f0210d0b0..2b6fd2cb263 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -148,7 +148,7 @@ void rna_ActionGroup_colorset_set(PointerRNA *ptr, int value) } } -void rna_BoneGroup_name_set(PointerRNA *ptr, const char *value) +static void rna_BoneGroup_name_set(PointerRNA *ptr, const char *value) { Object *ob = ptr->id.data; bActionGroup *agrp = ptr->data; @@ -257,7 +257,7 @@ static int rna_PoseChannel_has_ik_get(PointerRNA *ptr) return ED_pose_channel_in_IK_chain(ob, pchan); } -StructRNA *rna_IKParam_refine(PointerRNA *ptr) +static StructRNA *rna_IKParam_refine(PointerRNA *ptr) { bIKParam *param = (bIKParam *)ptr->data; @@ -269,7 +269,7 @@ StructRNA *rna_IKParam_refine(PointerRNA *ptr) } } -PointerRNA rna_Pose_ikparam_get(struct PointerRNA *ptr) +static PointerRNA rna_Pose_ikparam_get(struct PointerRNA *ptr) { bPose *pose = (bPose *)ptr->data; return rna_pointer_inherit_refine(ptr, &RNA_IKParam, pose->ikparam); @@ -593,7 +593,7 @@ static int rna_PoseChannel_rotation_4d_editable(PointerRNA *ptr, int index) } /* not essential, but much faster then the default lookup function */ -int rna_PoseBones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) +static int rna_PoseBones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr) { bPose *pose = (bPose *)ptr->data; bPoseChannel *pchan = BKE_pose_channel_find_name(pose, key); diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index d2e4e8edbfb..685e1ef7f11 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -50,12 +50,12 @@ /* RenderEngine Callbacks */ -void engine_tag_redraw(RenderEngine *engine) +static void engine_tag_redraw(RenderEngine *engine) { engine->flag |= RE_ENGINE_DO_DRAW; } -void engine_tag_update(RenderEngine *engine) +static void engine_tag_update(RenderEngine *engine) { engine->flag |= RE_ENGINE_DO_UPDATE; } @@ -234,7 +234,7 @@ static void rna_RenderLayer_rect_get(PointerRNA *ptr, float *values) memcpy(values, rl->rectf, sizeof(float) * rl->rectx * rl->recty * 4); } -void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values) +static void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values) { RenderLayer *rl = (RenderLayer *)ptr->data; memcpy(rl->rectf, values, sizeof(float) * rl->rectx * rl->recty * 4); @@ -256,7 +256,7 @@ static void rna_RenderPass_rect_get(PointerRNA *ptr, float *values) memcpy(values, rpass->rect, sizeof(float) * rpass->rectx * rpass->recty * rpass->channels); } -void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values) +static void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values) { RenderPass *rpass = (RenderPass *)ptr->data; memcpy(rpass->rect, values, sizeof(float) * rpass->rectx * rpass->recty * rpass->channels); diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index cdf7ac5e68f..10efc7a94a7 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -53,7 +53,7 @@ -void rna_Scene_frame_set(Scene *scene, int frame, float subframe) +static void rna_Scene_frame_set(Scene *scene, int frame, float subframe) { scene->r.cfra = frame; scene->r.subframe = subframe; diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index a6d4e473df4..32e388598f5 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -140,12 +140,12 @@ static void rna_Area_type_update(bContext *C, PointerRNA *ptr) } } -void rna_View2D_region_to_view(struct View2D *v2d, int x, int y, float result[2]) +static void rna_View2D_region_to_view(struct View2D *v2d, int x, int y, float result[2]) { UI_view2d_region_to_view(v2d, x, y, &result[0], &result[1]); } -void rna_View2D_view_to_region(struct View2D *v2d, float x, float y, int clip, int result[2]) +static void rna_View2D_view_to_region(struct View2D *v2d, float x, float y, int clip, int result[2]) { if (clip) UI_view2d_view_to_region(v2d, x, y, &result[0], &result[1]); diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 314082dfd02..6097fa2ae96 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -104,7 +104,7 @@ static StructRNA *rna_Sensor_refine(struct PointerRNA *ptr) } } -void rna_Sensor_name_set(PointerRNA *ptr, const char *value) +static void rna_Sensor_name_set(PointerRNA *ptr, const char *value) { bSensor *sens = (bSensor *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 88ce00936a3..ff5f4988cc1 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -478,7 +478,7 @@ static void rna_RegionView3D_view_matrix_set(PointerRNA *ptr, const float *value } /* api call */ -void rna_RegionView3D_update(ID *id, RegionView3D *rv3d) +static void rna_RegionView3D_update(ID *id, RegionView3D *rv3d) { bScreen *sc = (bScreen *)id; @@ -1102,7 +1102,7 @@ static void rna_def_space(BlenderRNA *brna) } /* for all spaces that use a mask */ -void rna_def_space_mask_info(StructRNA *srna, int noteflag, const char *mask_set_func) +static void rna_def_space_mask_info(StructRNA *srna, int noteflag, const char *mask_set_func) { PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index e62b3ecd804..a2880510958 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -32,6 +32,8 @@ #include "RNA_define.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include "IMB_imbuf.h" @@ -42,8 +44,8 @@ #include "RE_pipeline.h" #include "RE_shader_ext.h" -void save_envmap(struct EnvMap *env, bContext *C, ReportList *reports, const char *filepath, - struct Scene *scene, float layout[12]) +static void save_envmap(struct EnvMap *env, bContext *C, ReportList *reports, const char *filepath, + struct Scene *scene, float layout[12]) { if (scene == NULL) { scene = CTX_data_scene(C); @@ -52,7 +54,7 @@ void save_envmap(struct EnvMap *env, bContext *C, ReportList *reports, const cha RE_WriteEnvmapResult(reports, scene, env, filepath, scene->r.im_format.imtype, layout); } -void clear_envmap(struct EnvMap *env, bContext *C) +static void clear_envmap(struct EnvMap *env, bContext *C) { Main *bmain = CTX_data_main(C); Tex *tex; @@ -66,7 +68,7 @@ void clear_envmap(struct EnvMap *env, bContext *C) } } -void texture_evaluate(struct Tex *tex, float value[3], float color_r[4]) +static void texture_evaluate(struct Tex *tex, float value[3], float color_r[4]) { TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL}; multitex_ext(tex, value, NULL, NULL, 1, &texres); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 172a79970b5..0c62a280935 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -144,7 +144,7 @@ static void rna_tracking_active_track_set(PointerRNA *ptr, PointerRNA value) clip->tracking.act_track = NULL; } -void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value) +static void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value) { MovieClip *clip = (MovieClip *)ptr->id.data; MovieTracking *tracking = &clip->tracking; @@ -325,7 +325,7 @@ static void rna_tracking_active_object_set(PointerRNA *ptr, PointerRNA value) else clip->tracking.objectnr = 0; } -void rna_trackingObject_name_set(PointerRNA *ptr, const char *value) +static void rna_trackingObject_name_set(PointerRNA *ptr, const char *value) { MovieClip *clip = (MovieClip *)ptr->id.data; MovieTrackingObject *object = (MovieTrackingObject *)ptr->data; @@ -447,7 +447,7 @@ static MovieTrackingObject *rna_trackingObject_new(MovieTracking *tracking, cons return object; } -void rna_trackingObject_remove(MovieTracking *tracking, MovieTrackingObject *object) +static void rna_trackingObject_remove(MovieTracking *tracking, MovieTrackingObject *object) { BKE_tracking_object_delete(tracking, object); @@ -477,7 +477,7 @@ static MovieTrackingMarker *rna_trackingMarkers_insert_frame(MovieTrackingTrack return new_marker; } -void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int framenr) +static void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int framenr) { if (track->markersnr == 1) return; diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index ea38b60b25f..006e1ad3903 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -36,6 +36,8 @@ #include "UI_resources.h" +#include "rna_internal.h" + #ifdef RNA_RUNTIME static void rna_uiItemR(uiLayout *layout, PointerRNA *ptr, const char *propname, const char *name, int icon, diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 61c75e306cb..847641770e1 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1136,7 +1136,7 @@ static StructRNA *rna_Operator_register(Main *bmain, ReportList *reports, void * return dummyot.ext.srna; } -void **rna_Operator_instance(PointerRNA *ptr) +static void **rna_Operator_instance(PointerRNA *ptr) { wmOperator *op = ptr->data; return &op->py_instance; diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 4c93d7f54f0..cb4e00a042e 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -74,12 +74,12 @@ static int rna_event_modal_handler_add(struct bContext *C, struct wmOperator *op } /* XXX, need a way for python to know event types, 0x0110 is hard coded */ -wmTimer *rna_event_timer_add(struct wmWindowManager *wm, float time_step, wmWindow *win) +static wmTimer *rna_event_timer_add(struct wmWindowManager *wm, float time_step, wmWindow *win) { return WM_event_add_timer(wm, win, 0x0110, time_step); } -void rna_event_timer_remove(struct wmWindowManager *wm, wmTimer *timer) +static void rna_event_timer_remove(struct wmWindowManager *wm, wmTimer *timer) { WM_event_remove_timer(wm, timer->win, timer); } -- cgit v1.2.3