[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50813] trunk/blender/source/blender/ makesrna/intern: code cleanup: make many functions static
Campbell Barton
ideasman42 at gmail.com
Sat Sep 22 16:07:55 CEST 2012
Revision: 50813
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50813
Author: campbellbarton
Date: 2012-09-22 14:07:55 +0000 (Sat, 22 Sep 2012)
Log Message:
-----------
code cleanup: make many functions static
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_armature_api.c
trunk/blender/source/blender/makesrna/intern/rna_camera_api.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -256,7 +256,7 @@
return ptr->type;
}
-ID *rna_ID_copy(ID *id)
+static ID *rna_ID_copy(ID *id)
{
ID *newid;
@@ -309,7 +309,7 @@
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 @@
}
}
-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 @@
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 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -233,7 +233,7 @@
}
/* 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 @@
}
/* 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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -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 @@
}
}
-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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -100,7 +100,7 @@
}
}
-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 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_armature_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature_api.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature_api.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -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,
Modified: trunk/blender/source/blender/makesrna/intern/rna_camera_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_camera_api.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_camera_api.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -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];
Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_color.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_color.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -314,7 +314,7 @@
}
}
-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 @@
}
/* 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);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -77,7 +77,7 @@
}
}
-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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -432,20 +432,20 @@
}
/* 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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -403,13 +403,13 @@
}
}
-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");
Modified: trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_gpencil.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_gpencil.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -90,7 +90,7 @@
}
}
-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;
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c 2012-09-22 13:40:31 UTC (rev 50812)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c 2012-09-22 14:07:55 UTC (rev 50813)
@@ -147,7 +147,7 @@
}
-char *rna_ImageUser_path(PointerRNA *ptr)
+static char *rna_ImageUser_path(PointerRNA *ptr)
{
if (ptr->id.data) {
/* ImageUser *iuser= ptr->data; */
Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_key.c 2012-09-22 13:40:31 UTC (rev 50812)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list