tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

use static functions where possible for some local functions.

This commit is contained in:
Campbell Barton 2009-09-14 16:52:06 +00:00
parent 131c713fc1
commit ba5df38d66
55 changed files with 178 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenfont/intern/blf.c
View File

@ -102,7 +102,7 @@ void BLF_exit(void)
blf_font_exit();
}
int blf_search(char *name)
static int blf_search(char *name)
{
FontBLF *font;
int i;

2
source/blender/blenfont/intern/blf_dir.c
View File

@ -51,7 +51,7 @@
static ListBase global_font_dir= { NULL, NULL };
DirBLF *blf_dir_find(const char *path)
static DirBLF *blf_dir_find(const char *path)
{
DirBLF *p;

2
source/blender/blenfont/intern/blf_font.c
View File

@ -453,7 +453,7 @@ void blf_font_free(FontBLF *font)
MEM_freeN(font);
}
void blf_font_fill(FontBLF *font)
static void blf_font_fill(FontBLF *font)
{
font->aspect= 1.0f;
font->pos[0]= 0.0f;

2
source/blender/blenfont/intern/blf_glyph.c
View File

@ -136,7 +136,7 @@ void blf_glyph_cache_free(GlyphCacheBLF *gc)
MEM_freeN(gc);
}
void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc)
static void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc)
{
int tot_mem, i;
unsigned char *buf;

6
source/blender/blenkernel/intern/action.c
View File

@ -214,7 +214,7 @@ bAction *copy_action (bAction *src)
/* Get the active action-group for an Action */
bActionGroup *get_active_actiongroup (bAction *act)
static bActionGroup *get_active_actiongroup (bAction *act)
{
bActionGroup *agrp= NULL;
@ -1165,7 +1165,7 @@ typedef struct NlaIpoChannel {
int type;
} NlaIpoChannel;
void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, const char *name, float ctime)
static void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, const char *name, float ctime)
{
bActionChannel *achan= get_action_channel(act, name);
IpoCurve *icu;
@ -1258,7 +1258,7 @@ static void blend_ipochannels(ListBase *dst, ListBase *src, float srcweight, int
}
}
int execute_ipochannels(ListBase *lb)
static int execute_ipochannels(ListBase *lb)
{
NlaIpoChannel *nic;
int count = 0;

2
source/blender/blenkernel/intern/anim_sys.c
View File

@ -438,7 +438,7 @@ void BKE_keyingsets_free (ListBase *list)
* - path: original path string (as stored in F-Curve data)
* - dst: destination string to write data to
*/
short animsys_remap_path (AnimMapper *remap, char *path, char **dst)
static short animsys_remap_path (AnimMapper *remap, char *path, char **dst)
{
/* is there a valid remapping table to use? */
//if (remap) {

2
source/blender/blenkernel/intern/brush.c
View File

@ -711,7 +711,7 @@ static void brush_painter_do_partial(BrushPainter *painter, ImBuf *oldtexibuf, i
}
}
void brush_painter_fixed_tex_partial_update(BrushPainter *painter, float *pos)
static void brush_painter_fixed_tex_partial_update(BrushPainter *painter, float *pos)
{
Brush *brush= painter->brush;
BrushPainterCache *cache= &painter->cache;

10
source/blender/blenkernel/intern/cloth.c
View File

@ -95,7 +95,7 @@ static CM_SOLVER_DEF solvers [] =
static void cloth_to_object (Object *ob, ClothModifierData *clmd, DerivedMesh *dm);
static void cloth_from_mesh ( Object *ob, ClothModifierData *clmd, DerivedMesh *dm );
static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr, int first);
int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm );
static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm );
static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm );
@ -155,7 +155,7 @@ void cloth_init ( ClothModifierData *clmd )
clmd->sim_parms->goalfrict = 0.0f;
}
BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
static BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
{
unsigned int i;
BVHTree *bvhtree;
@ -196,7 +196,7 @@ BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
return bvhtree;
}
BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
static BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
{
unsigned int i;
BVHTree *bvhtree;
@ -998,7 +998,7 @@ int cloth_add_spring ( ClothModifierData *clmd, unsigned int indexA, unsigned in
return 0;
}
void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgelist)
static void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgelist)
{
unsigned int i = 0;
@ -1031,7 +1031,7 @@ void cloth_free_errorsprings(Cloth *cloth, EdgeHash *edgehash, LinkNode **edgeli
BLI_edgehash_free ( cloth->edgehash, NULL );
}
int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
{
Cloth *cloth = clmd->clothObject;
ClothSpring *spring = NULL, *tspring = NULL, *tspring2 = NULL;

16
source/blender/blenkernel/intern/collision.c
View File

@ -313,7 +313,7 @@ gsl_poly_solve_quadratic (double a, double b, double c,
* See Bridson et al. "Robust Treatment of Collision, Contact and Friction for Cloth Animation"
* page 4, left column
*/
int cloth_get_collision_time ( double a[3], double b[3], double c[3], double d[3], double e[3], double f[3], double solution[3] )
static int cloth_get_collision_time ( double a[3], double b[3], double c[3], double d[3], double e[3], double f[3], double solution[3] )
{
int num_sols = 0;
@ -427,7 +427,7 @@ int cloth_get_collision_time ( double a[3], double b[3], double c[3], double d[3
// w3 is not perfect
void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 )
static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 )
{
double tempV1[3], tempV2[3], tempV4[3];
double a,b,c,d,e,f;
@ -726,7 +726,7 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap
return collpair;
}
int cloth_collision_response_moving( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
static int cloth_collision_response_moving( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
{
int result = 0;
Cloth *cloth1;
@ -891,7 +891,7 @@ static void findClosestPointsEE(float *x1, float *x2, float *x3, float *x4, floa
}
// calculates the distance of 2 edges
float edgedge_distance(float np11[3], float np12[3], float np21[3], float np22[3], float *out_a1, float *out_a2, float *out_normal)
static float edgedge_distance(float np11[3], float np12[3], float np21[3], float np22[3], float *out_a1, float *out_a2, float *out_normal)
{
float line1[3], line2[3], cross[3];
float length;
@ -1065,7 +1065,7 @@ float edgedge_distance(float np11[3], float np12[3], float np21[3], float np22[3
return 0;
}
int cloth_collision_moving_edges ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair )
static int cloth_collision_moving_edges ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair )
{
EdgeCollPair edgecollpair;
Cloth *cloth1=NULL;
@ -1275,7 +1275,7 @@ int cloth_collision_moving_edges ( ClothModifierData *clmd, CollisionModifierDat
return result;
}
int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
static int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
{
Cloth *cloth1;
cloth1 = clmd->clothObject;
@ -1392,7 +1392,7 @@ CollisionModifierData **get_collisionobjects(Scene *scene, Object *self, int *nu
return objs;
}
void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair **collisions, CollPair **collisions_index, int numresult, BVHTreeOverlap *overlap)
static void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair **collisions, CollPair **collisions_index, int numresult, BVHTreeOverlap *overlap)
{
int i;
@ -1405,7 +1405,7 @@ void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, CollisionModi
}
}
int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair *collisions, CollPair *collisions_index)
static int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair *collisions, CollPair *collisions_index)
{
Cloth *cloth = clmd->clothObject;
int i=0, j = 0, numfaces = 0, numverts = 0;

8
source/blender/blenkernel/intern/curve.c
View File

@ -68,7 +68,7 @@
/* globals */
/* local */
int cu_isectLL(float *v1, float *v2, float *v3, float *v4,
static int cu_isectLL(float *v1, float *v2, float *v3, float *v4,
short cox, short coy,
float *labda, float *mu, float *vec);
@ -977,7 +977,7 @@ void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int i
}
}
void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float *p3, float *p, int it, int stride)
static void forward_diff_bezier_cotangent(float *p0, float *p1, float *p2, float *p3, float *p, int it, int stride)
{
/* note that these are not purpendicular to the curve
* they need to be rotated for this,
@ -1363,7 +1363,7 @@ void makebevelcurve(Scene *scene, Object *ob, ListBase *disp)
}
}
int cu_isectLL(float *v1, float *v2, float *v3, float *v4, short cox, short coy, float *labda, float *mu, float *vec)
static int cu_isectLL(float *v1, float *v2, float *v3, float *v4, short cox, short coy, float *labda, float *mu, float *vec)
{
/* return:
-1: colliniar
@ -1882,7 +1882,7 @@ static void make_bevel_list_3D_tangent(BevList *bl)
}
}
void make_bevel_list_3D(BevList *bl, int smooth_iter, int twist_mode)
static void make_bevel_list_3D(BevList *bl, int smooth_iter, int twist_mode)
{
switch(twist_mode) {
case CU_TWIST_TANGENT:

2
source/blender/blenkernel/intern/displist.c
View File

@ -1131,7 +1131,7 @@ static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase)
}
void curve_to_filledpoly(Curve *cu, ListBase *nurb, ListBase *dispbase)
static void curve_to_filledpoly(Curve *cu, ListBase *nurb, ListBase *dispbase)
{
if(cu->flag & CU_3D) return;

6
source/blender/blenkernel/intern/fcurve.c
View File

@ -916,7 +916,7 @@ void correct_bezpart (float *v1, float *v2, float *v3, float *v4)
}
/* find root ('zero') */
int findzero (float x, float q0, float q1, float q2, float q3, float *o)
static int findzero (float x, float q0, float q1, float q2, float q3, float *o)
{
double c0, c1, c2, c3, a, b, c, p, q, d, t, phi;
int nr= 0;
@ -1010,7 +1010,7 @@ int findzero (float x, float q0, float q1, float q2, float q3, float *o)
}
}
void berekeny (float f1, float f2, float f3, float f4, float *o, int b)
static void berekeny (float f1, float f2, float f3, float f4, float *o, int b)
{
float t, c0, c1, c2, c3;
int a;
@ -1026,7 +1026,7 @@ void berekeny (float f1, float f2, float f3, float f4, float *o, int b)
}
}
void berekenx (float *f, float *o, int b)
static void berekenx (float *f, float *o, int b)
{
float t, c0, c1, c2, c3;
int a;

2
source/blender/blenkernel/intern/font.c
View File

@ -129,7 +129,7 @@ wcsleninu8(wchar_t *src)
}
int
utf8slen(char *src)
static utf8slen(char *src)
{
int size = 0, index = 0;
unsigned char c;

22
source/blender/blenkernel/intern/implicit.c
View File

@ -43,7 +43,7 @@
#include <windows.h>
static LARGE_INTEGER _itstart, _itend;
static LARGE_INTEGER ifreq;
void itstart(void)
static void itstart(void)
{
static int first = 1;
if(first) {
@ -52,7 +52,7 @@ void itstart(void)
}
QueryPerformanceCounter(&_itstart);
}
void itend(void)
static void itend(void)
{
QueryPerformanceCounter(&_itend);
}
@ -74,7 +74,7 @@ double itval()
{
gettimeofday(&_itstart, &itz);
}
void itend(void)
static void itend(void)
{
gettimeofday(&_itend,&itz);
}
@ -155,7 +155,7 @@ DO_INLINE void mul_fvectorT_fvectorS(float to[3][3], float vectorA[3], float vec
/* printf vector[3] on console: for debug output */
void print_fvector(float m3[3])
static void print_fvector(float m3[3])
{
printf("%f\n%f\n%f\n\n",m3[0],m3[1],m3[2]);
}
@ -297,7 +297,7 @@ DO_INLINE void sub_lfvector_lfvector(float (*to)[3], float (*fLongVectorA)[3], f
// 3x3 matrix
///////////////////////////
/* printf 3x3 matrix on console: for debug output */
void print_fmatrix(float m3[3][3])
static void print_fmatrix(float m3[3][3])
{
printf("%f\t%f\t%f\n",m3[0][0],m3[0][1],m3[0][2]);
printf("%f\t%f\t%f\n",m3[1][0],m3[1][1],m3[1][2]);
@ -496,7 +496,7 @@ DO_INLINE void mulsub_fmatrix_fvector(float to[3], float matrix[3][3], float fro
// SPARSE SYMMETRIC big matrix with 3x3 matrix entries
///////////////////////////
/* printf a big matrix on console: for debug output */
void print_bfmatrix(fmatrix3x3 *m3)
static void print_bfmatrix(fmatrix3x3 *m3)
{
unsigned int i = 0;
@ -887,7 +887,7 @@ DO_INLINE void filter(lfVector *V, fmatrix3x3 *S)
}
}
int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S)
static int cg_filtered(lfVector *ldV, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S)
{
// Solves for unknown X in equation AX=B
unsigned int conjgrad_loopcount=0, conjgrad_looplimit=100;
@ -970,7 +970,7 @@ DO_INLINE void BuildPPinv(fmatrix3x3 *lA, fmatrix3x3 *P, fmatrix3x3 *Pinv)
}
/*
// version 1.3
int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv)
static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv)
{
unsigned int numverts = lA[0].vcount, iterations = 0, conjgrad_looplimit=100;
float delta0 = 0, deltaNew = 0, deltaOld = 0, alpha = 0;
@ -1038,7 +1038,7 @@ int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fma
}
*/
// version 1.4
int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *bigI)
static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *bigI)
{
unsigned int numverts = lA[0].vcount, iterations = 0, conjgrad_looplimit=100;
float delta0 = 0, deltaNew = 0, deltaOld = 0, alpha = 0, tol = 0;
@ -1391,7 +1391,7 @@ static void CalcFloat4( float *v1, float *v2, float *v3, float *v4, float *n)
n[2]= n1[0]*n2[1]-n1[1]*n2[0];
}
float calculateVertexWindForce(float wind[3], float vertexnormal[3])
static float calculateVertexWindForce(float wind[3], float vertexnormal[3])
{
return (INPR(wind, vertexnormal));
}
@ -1595,7 +1595,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float frame, lfVector *lF,
// printf("\n");
}
void simulate_implicit_euler(lfVector *Vnew, lfVector *lX, lfVector *lV, lfVector *lF, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, float dt, fmatrix3x3 *A, lfVector *B, lfVector *dV, fmatrix3x3 *S, lfVector *z, lfVector *olddV, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *M, fmatrix3x3 *bigI)
static void simulate_implicit_euler(lfVector *Vnew, lfVector *lX, lfVector *lV, lfVector *lF, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, float dt, fmatrix3x3 *A, lfVector *B, lfVector *dV, fmatrix3x3 *S, lfVector *z, lfVector *olddV, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *M, fmatrix3x3 *bigI)
{
unsigned int numverts = dFdV[0].vcount;

2
source/blender/blenkernel/intern/ipo.c
View File

@ -820,7 +820,7 @@ static char *particle_adrcodes_to_paths (int adrcode, int *array_index)
* - array_index - index in property's array (if applicable) to use
* - return - the allocated path...
*/
char *get_rna_access (int blocktype, int adrcode, char actname[], char constname[], int *array_index)
static char *get_rna_access (int blocktype, int adrcode, char actname[], char constname[], int *array_index)
{
DynStr *path= BLI_dynstr_new();
char *propname=NULL, *rpath=NULL;

42
source/blender/blenkernel/intern/modifier.c
View File

@ -214,7 +214,7 @@ static void curveModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tcmd->name, cmd->name, 32);
}
CustomDataMask curveModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask curveModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CurveModifierData *cmd = (CurveModifierData *)md;
CustomDataMask dataMask = 0;
@ -290,7 +290,7 @@ static void latticeModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tlmd->name, lmd->name, 32);
}
CustomDataMask latticeModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask latticeModifier_requiredDataMask(Object *ob, ModifierData *md)
{
LatticeModifierData *lmd = (LatticeModifierData *)md;
CustomDataMask dataMask = 0;
@ -1104,7 +1104,7 @@ static void arrayModifier_updateDepgraph(ModifierData *md, DagForest *forest, Sc
}
}
float vertarray_size(MVert *mvert, int numVerts, int axis)
static float vertarray_size(MVert *mvert, int numVerts, int axis)
{
int i;
float min_co, max_co;
@ -1771,7 +1771,7 @@ static void mirrorModifier_updateDepgraph(ModifierData *md, DagForest *forest, S
/* finds the best possible flipped name. For renaming; check for unique names afterwards */
/* if strip_number: removes number extensions */
void vertgroup_flip_name (char *name, int strip_number)
static void vertgroup_flip_name (char *name, int strip_number)
{
int len;
char prefix[128]={""}; /* The part before the facing */
@ -3401,7 +3401,7 @@ static void bevelModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tbmd->defgrp_name, bmd->defgrp_name, 32);
}
CustomDataMask bevelModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask bevelModifier_requiredDataMask(Object *ob, ModifierData *md)
{
BevelModifierData *bmd = (BevelModifierData *)md;
CustomDataMask dataMask = 0;
@ -3481,7 +3481,7 @@ static void displaceModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tdmd->uvlayer_name, dmd->uvlayer_name, 32);
}
CustomDataMask displaceModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask displaceModifier_requiredDataMask(Object *ob, ModifierData *md)
{
DisplaceModifierData *dmd = (DisplaceModifierData *)md;
CustomDataMask dataMask = 0;
@ -3825,7 +3825,7 @@ static void uvprojectModifier_copyData(ModifierData *md, ModifierData *target)
tumd->aspecty = umd->aspecty;
}
CustomDataMask uvprojectModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask uvprojectModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CustomDataMask dataMask = 0;
@ -4278,7 +4278,7 @@ static void smoothModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tsmd->defgrp_name, smd->defgrp_name, 32);
}
int smoothModifier_isDisabled(ModifierData *md)
static int smoothModifier_isDisabled(ModifierData *md)
{
SmoothModifierData *smd = (SmoothModifierData*) md;
short flag;
@ -4291,7 +4291,7 @@ int smoothModifier_isDisabled(ModifierData *md)
return 0;
}
CustomDataMask smoothModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask smoothModifier_requiredDataMask(Object *ob, ModifierData *md)
{
SmoothModifierData *smd = (SmoothModifierData *)md;
CustomDataMask dataMask = 0;
@ -4508,7 +4508,7 @@ static void castModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tcmd->defgrp_name, cmd->defgrp_name, 32);
}
int castModifier_isDisabled(ModifierData *md)
static int castModifier_isDisabled(ModifierData *md)
{
CastModifierData *cmd = (CastModifierData*) md;
short flag;
@ -4520,7 +4520,7 @@ int castModifier_isDisabled(ModifierData *md)
return 0;
}
CustomDataMask castModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask castModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CastModifierData *cmd = (CastModifierData *)md;
CustomDataMask dataMask = 0;
@ -5151,7 +5151,7 @@ static void waveModifier_updateDepgraph(
}
}
CustomDataMask waveModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask waveModifier_requiredDataMask(Object *ob, ModifierData *md)
{
WaveModifierData *wmd = (WaveModifierData *)md;
CustomDataMask dataMask = 0;
@ -5487,7 +5487,7 @@ static void armatureModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(tamd->defgrp_name, amd->defgrp_name, 32);
}
CustomDataMask armatureModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask armatureModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CustomDataMask dataMask = 0;
@ -5602,7 +5602,7 @@ static void hookModifier_copyData(ModifierData *md, ModifierData *target)
strncpy(thmd->subtarget, hmd->subtarget, 32);
}
CustomDataMask hookModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask hookModifier_requiredDataMask(Object *ob, ModifierData *md)
{
HookModifierData *hmd = (HookModifierData *)md;
CustomDataMask dataMask = 0;
@ -5947,7 +5947,7 @@ static void clothModifier_updateDepgraph(
}
}
CustomDataMask clothModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask clothModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CustomDataMask dataMask = 0;
@ -6371,7 +6371,7 @@ static DerivedMesh *booleanModifier_applyModifier(
return derivedData;
}
CustomDataMask booleanModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask booleanModifier_requiredDataMask(Object *ob, ModifierData *md)
{
CustomDataMask dataMask = (1 << CD_MTFACE) + (1 << CD_MEDGE);
@ -6419,7 +6419,7 @@ static void particleSystemModifier_copyData(ModifierData *md, ModifierData *targ
tpsmd->psys = psmd->psys;
}
CustomDataMask particleSystemModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask particleSystemModifier_requiredDataMask(Object *ob, ModifierData *md)
{
ParticleSystemModifierData *psmd= (ParticleSystemModifierData*) md;
CustomDataMask dataMask = 0;
@ -6832,7 +6832,7 @@ static int explodeModifier_dependsOnTime(ModifierData *md)
{
return 1;
}
CustomDataMask explodeModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask explodeModifier_requiredDataMask(Object *ob, ModifierData *md)
{
ExplodeModifierData *emd= (ExplodeModifierData*) md;
CustomDataMask dataMask = 0;
@ -7746,7 +7746,7 @@ static void meshdeformModifier_copyData(ModifierData *md, ModifierData *target)
tmmd->object = mmd->object;
}
CustomDataMask meshdeformModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask meshdeformModifier_requiredDataMask(Object *ob, ModifierData *md)
{
MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
CustomDataMask dataMask = 0;
@ -8126,7 +8126,7 @@ static void shrinkwrapModifier_copyData(ModifierData *md, ModifierData *target)
tsmd->subsurfLevels = smd->subsurfLevels;
}
CustomDataMask shrinkwrapModifier_requiredDataMask(Object *ob, ModifierData *md)
static CustomDataMask shrinkwrapModifier_requiredDataMask(Object *ob, ModifierData *md)
{
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
CustomDataMask dataMask = 0;
@ -9137,7 +9137,7 @@ int modifiers_indexInObject(Object *ob, ModifierData *md_seek)
return i;
}
int modifiers_usesPointCache(Object *ob)
static int modifiers_usesPointCache(Object *ob)
{
ModifierData *md = ob->modifiers.first;

4
source/blender/blenkernel/intern/multires.c
View File

@ -596,7 +596,7 @@ static void find_displacer_edges(MultiresDisplacer *d, DerivedMesh *dm, Displace
}
/* Returns in out the corners [0-3] that use v1 and v2 */
void find_face_corners(MFace *f, int v1, int v2, int out[2])
static void find_face_corners(MFace *f, int v1, int v2, int out[2])
{
int i, end = f->v4 ? 4 : 3;
@ -1259,7 +1259,7 @@ struct DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, i
***************************/
/* Does not actually free lvl itself */
void multires_free_level(MultiresLevel *lvl)
static void multires_free_level(MultiresLevel *lvl)
{
if(lvl) {
if(lvl->faces) MEM_freeN(lvl->faces);

2
source/blender/blenkernel/intern/nla.c
View File

@ -1048,7 +1048,7 @@ short BKE_nlastrip_within_bounds (NlaStrip *strip, float min, float max)
/* Is the given NLA-strip the first one to occur for the given AnimData block */
// TODO: make this an api method if necesary, but need to add prefix first
short nlastrip_is_first (AnimData *adt, NlaStrip *strip)
static short nlastrip_is_first (AnimData *adt, NlaStrip *strip)
{
NlaTrack *nlt;
NlaStrip *ns;

2
source/blender/blenkernel/intern/object.c
View File

@ -1406,7 +1406,7 @@ int object_data_is_libdata(Object *ob)
/* *************** PROXY **************** */
/* when you make proxy, ensure the exposed layers are extern */
void armature_set_id_extern(Object *ob)
static void armature_set_id_extern(Object *ob)
{
bArmature *arm= ob->data;
bPoseChannel *pchan;

2
source/blender/blenkernel/intern/packedFile.c
View File

@ -236,7 +236,7 @@ void packAll(Main *bmain, ReportList *reports)
// attempt to create a function that generates an unique filename
// this will work when all funtions in fileops.c understand relative filenames...
char *find_new_name(char *name)
static char *find_new_name(char *name)
{
char tempname[FILE_MAXDIR + FILE_MAXFILE];
char *newname;

2
source/blender/blenkernel/intern/particle_system.c
View File

@ -2252,7 +2252,7 @@ void psys_make_temp_pointcache(Object *ob, ParticleSystem *psys)
BKE_ptcache_disk_to_mem(&pid);
}
void psys_clear_temp_pointcache(ParticleSystem *psys)
static void psys_clear_temp_pointcache(ParticleSystem *psys)
{
if((psys->pointcache->flag & PTCACHE_DISK_CACHE)==0)
return;

20
source/blender/blenkernel/intern/sequence.c
View File

@ -127,7 +127,7 @@ void new_tstripdata(Sequence *seq)
/* free */
void free_proxy_seq(Sequence *seq)
static void free_proxy_seq(Sequence *seq)
{
if (seq->strip && seq->strip->proxy && seq->strip->proxy->anim) {
IMB_free_anim(seq->strip->proxy->anim);
@ -682,7 +682,7 @@ void clear_scene_in_allseqs(Scene *sce)
}
}
char *give_seqname_by_type(int type)
static char *give_seqname_by_type(int type)
{
switch(type) {
case SEQ_META: return "Meta";
@ -949,7 +949,7 @@ static TStripElem* alloc_tstripdata(int len, const char * name)
return se;
}
TStripElem *give_tstripelem(Sequence *seq, int cfra)
static TStripElem *give_tstripelem(Sequence *seq, int cfra)
{
TStripElem *se;
int nr;
@ -1297,7 +1297,7 @@ static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra, int re
se->ibuf = 0;
}
void seq_proxy_rebuild(Scene *scene, Sequence * seq)
static void seq_proxy_rebuild(Scene *scene, Sequence * seq)
{
int cfra;
float rsize = seq->strip->proxy->size;
@ -2623,7 +2623,7 @@ ImBuf *give_ibuf_seq(Scene *scene, int rectx, int recty, int cfra, int chanshown
}
/* check used when we need to change seq->blend_mode but not to effect or audio strips */
int seq_can_blend(Sequence *seq)
static int seq_can_blend(Sequence *seq)
{
if (ELEM4(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE)) {
return 1;
@ -2749,7 +2749,7 @@ static void *seq_prefetch_thread(void * This_)
return 0;
}
void seq_start_threads(Scene *scene)
static void seq_start_threads(Scene *scene)
{
int i;
@ -2782,7 +2782,7 @@ void seq_start_threads(Scene *scene)
BLI_init_threads(0, 0, 0);
}
void seq_stop_threads()
static void seq_stop_threads()
{
PrefetchThread *tslot;
PrefetchQueueElem *e;
@ -2850,7 +2850,7 @@ void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown,
pthread_mutex_unlock(&wakeup_lock);
}
void seq_wait_for_prefetch_ready()
static void seq_wait_for_prefetch_ready()
{
PrefetchThread *tslot;
@ -2984,7 +2984,7 @@ static void free_anim_seq(Sequence *seq)
}
}
void free_imbuf_seq_except(Scene *scene, int cfra)
static void free_imbuf_seq_except(Scene *scene, int cfra)
{
Editing *ed= seq_give_editing(scene, FALSE);
Sequence *seq;
@ -3178,7 +3178,7 @@ void free_imbuf_seq()
}
#endif
void free_imbuf_seq_with_ipo(Scene *scene, struct Ipo *ipo)
static void free_imbuf_seq_with_ipo(Scene *scene, struct Ipo *ipo)
{
/* force update of all sequences with this ipo, on ipo changes */
Editing *ed= seq_give_editing(scene, FALSE);

10
source/blender/blenkernel/intern/smoke.c
View File

@ -526,7 +526,7 @@ void calcTriangleDivs(Object *ob, MVert *verts, int numverts, MFace *faces, int
}
}
void smokeModifier_freeDomain(SmokeModifierData *smd)
static void smokeModifier_freeDomain(SmokeModifierData *smd)
{
if(smd->domain)
{
@ -550,7 +550,7 @@ void smokeModifier_freeDomain(SmokeModifierData *smd)
}
}
void smokeModifier_freeFlow(SmokeModifierData *smd)
static void smokeModifier_freeFlow(SmokeModifierData *smd)
{
if(smd->flow)
{
@ -567,7 +567,7 @@ void smokeModifier_freeFlow(SmokeModifierData *smd)
}
}
void smokeModifier_freeCollision(SmokeModifierData *smd)
static void smokeModifier_freeCollision(SmokeModifierData *smd)
{
if(smd->coll)
{
@ -741,7 +741,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
}
// forward decleration
void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct);
static void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct);
static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
static int get_lamp(Scene *scene, float *light)
{
@ -1337,7 +1337,7 @@ static void get_cell(float *p0, int res[3], float dx, float *pos, int *cell, int
}
}
void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct)
static void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct)
{
int x, y, z;
float bv[6];

2
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -613,7 +613,7 @@ static AVStream* alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex
}
/* essential functions -- start, append, end */
void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty)
static void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty)
{
/* Handle to the output file */
AVFormatContext* of;

4
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -329,7 +329,7 @@ static void sort(BVHNode **a0, int begin, int end, int axis)
bvh_insertionsort(a, begin, end, axis);
}
}
void sort_along_axis(BVHTree *tree, int start, int end, int axis)
static void sort_along_axis(BVHTree *tree, int start, int end, int axis)
{
sort(tree->nodes, start, end, axis);
}
@ -337,7 +337,7 @@ void sort_along_axis(BVHTree *tree, int start, int end, int axis)
//after a call to this function you can expect one of:
// every node to left of a[n] are smaller or equal to it
// every node to the right of a[n] are greater or equal to it
int partition_nth_element(BVHNode **a, int _begin, int _end, int n, int axis){
static int partition_nth_element(BVHNode **a, int _begin, int _end, int n, int axis){
int begin = _begin, end = _end, cut;
while(end-begin > 3)
{

2
source/blender/blenlib/intern/BLI_kdtree.c
View File

@ -337,7 +337,7 @@ int BLI_kdtree_find_n_nearest(KDTree *tree, int n, float *co, float *nor, KDTree
return found;
}
int range_compare(const void * a, const void * b)
static int range_compare(const void * a, const void * b)
{
const KDTreeNearest *kda = a;
const KDTreeNearest *kdb = b;

16
source/blender/blenlib/intern/arithb.c
View File

@ -4093,19 +4093,19 @@ void spheremap(float x, float y, float z, float *u, float *v)
/* proposed api by ton and zr, not used yet */
#if 0
/* ***************** m1 = m2 ***************** */
void cpy_m3_m3(float m1[][3], float m2[][3])
static void cpy_m3_m3(float m1[][3], float m2[][3])
{
memcpy(m1[0], m2[0], 9*sizeof(float));
}
/* ***************** m1 = m2 ***************** */
void cpy_m4_m4(float m1[][4], float m2[][4])
static void cpy_m4_m4(float m1[][4], float m2[][4])
{
memcpy(m1[0], m2[0], 16*sizeof(float));
}
/* ***************** identity matrix ***************** */
void ident_m4(float m[][4])
static void ident_m4(float m[][4])
{
m[0][0]= m[1][1]= m[2][2]= m[3][3]= 1.0;
@ -4116,7 +4116,7 @@ void ident_m4(float m[][4])
}
/* ***************** m1 = m2 (pre) * m3 (post) ***************** */
void mul_m3_m3m3(float m1[][3], float m2[][3], float m3[][3])
static void mul_m3_m3m3(float m1[][3], float m2[][3], float m3[][3])
{
float m[3][3];
@ -4136,7 +4136,7 @@ void mul_m3_m3m3(float m1[][3], float m2[][3], float m3[][3])
}
/* ***************** m1 = m2 (pre) * m3 (post) ***************** */
void mul_m4_m4m4(float m1[][4], float m2[][4], float m3[][4])
static void mul_m4_m4m4(float m1[][4], float m2[][4], float m3[][4])
{
float m[4][4];
@ -4164,7 +4164,7 @@ void mul_m4_m4m4(float m1[][4], float m2[][4], float m3[][4])
}
/* ***************** m1 = inverse(m2) ***************** */
void inv_m3_m3(float m1[][3], float m2[][3])
static void inv_m3_m3(float m1[][3], float m2[][3])
{
short a,b;
float det;
@ -4187,7 +4187,7 @@ void inv_m3_m3(float m1[][3], float m2[][3])
}
/* ***************** m1 = inverse(m2) ***************** */
int inv_m4_m4(float inverse[][4], float mat[][4])
static int inv_m4_m4(float inverse[][4], float mat[][4])
{
int i, j, k;
double temp;
@ -4240,7 +4240,7 @@ int inv_m4_m4(float inverse[][4], float mat[][4])
}
/* ***************** v1 = v2 * mat ***************** */
void mul_v3_v3m4(float *v1, float *v2, float mat[][4])
static void mul_v3_v3m4(float *v1, float *v2, float mat[][4])
{
float x, y;

4
source/blender/blenlib/intern/freetypefont.c
View File

@ -65,7 +65,7 @@ static FT_Library library;
static FT_Error err;
void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
static void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
{
// Blender
struct Nurb *nu;
@ -275,7 +275,7 @@ void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)
}
}
int objchr_to_ftvfontdata(VFont *vfont, FT_ULong charcode)
static int objchr_to_ftvfontdata(VFont *vfont, FT_ULong charcode)
{
// Freetype2
FT_Face face;

6
source/blender/blenlib/intern/graph.c
View File

@ -354,7 +354,7 @@ void BLI_ReflagSubgraph(BGraph *graph, int old_subgraph, int new_subgraph)
/*************************************** CYCLE DETECTION ***********************************************/
int detectCycle(BNode *node, BArc *src_arc)
static int detectCycle(BNode *node, BArc *src_arc)
{
int value = 0;
@ -520,7 +520,7 @@ void BLI_calcGraphLength(BGraph *graph)
/********************************* SYMMETRY DETECTION **************************************************/
void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit);
static void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit);
void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3])
{
@ -935,7 +935,7 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int
}
}
void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit)
static void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit)
{
int i;

12
source/blender/blenlib/intern/noise.c
View File

@ -42,9 +42,9 @@
#endif
/* local */
float noise3_perlin(float vec[3]);
float turbulence_perlin(float *point, float lofreq, float hifreq);
float turbulencep(float noisesize, float x, float y, float z, int nr);
static float noise3_perlin(float vec[3]);
static float turbulence_perlin(float *point, float lofreq, float hifreq);
static float turbulencep(float noisesize, float x, float y, float z, int nr);
#define HASHVEC(x,y,z) hashvectf+3*hash[ (hash[ (hash[(z) & 255]+(y)) & 255]+(x)) & 255]
@ -915,7 +915,7 @@ float g[512+2][3]= {
r1 = r0 - 1.;
float noise3_perlin(float vec[3])
static float noise3_perlin(float vec[3])
{
int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
float rx0, rx1, ry0, ry1, rz0, rz1, *q, sx, sy, sz, a, b, c, d, t, u, v;
@ -976,7 +976,7 @@ float noise3_perlin(float vec[3])
return 1.5 * lerp(sz, c, d); /* interpolate in z */
}
float turbulence_perlin(float *point, float lofreq, float hifreq)
static float turbulence_perlin(float *point, float lofreq, float hifreq)
{
float freq, t, p[3];
@ -1029,7 +1029,7 @@ float BLI_hnoisep(float noisesize, float x, float y, float z)
return noise3_perlin(vec);
}
float turbulencep(float noisesize, float x, float y, float z, int nr)
static float turbulencep(float noisesize, float x, float y, float z, int nr)
{
float vec[3];

2
source/blender/blenlib/intern/threads.c
View File

@ -316,7 +316,7 @@ typedef struct WorkParam {
int index;
} WorkParam;
void *exec_work_fnct(void *v_param)
static void *exec_work_fnct(void *v_param)
{
WorkParam *p = (WorkParam*)v_param;
void *value;

4
source/blender/makesrna/intern/rna_action.c
View File

@ -38,7 +38,7 @@
#else
void rna_def_action_group(BlenderRNA *brna)
static void rna_def_action_group(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -76,7 +76,7 @@ void rna_def_action_group(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Custom Color", "Index of custom color set.");
}
void rna_def_action(BlenderRNA *brna)
static void rna_def_action(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

4
source/blender/makesrna/intern/rna_animation.c
View File

@ -93,7 +93,7 @@ static void rna_ksPath_RnaPath_set(PointerRNA *ptr, const char *value)
#else
void rna_def_keyingset_path(BlenderRNA *brna)
static void rna_def_keyingset_path(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -132,7 +132,7 @@ void rna_def_keyingset_path(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Entire Array", "When an 'array/vector' type is chosen (Location, Rotation, Color, etc.), entire array is to be used.");
}
void rna_def_keyingset(BlenderRNA *brna)
static void rna_def_keyingset(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_armature.c
View File

@ -520,7 +520,7 @@ static void rna_def_edit_bone(BlenderRNA *brna)
RNA_define_verify_sdna(1);
}
void rna_def_armature(BlenderRNA *brna)
static void rna_def_armature(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_brush.c
View File

@ -89,7 +89,7 @@ static void rna_Brush_active_texture_set(PointerRNA *ptr, PointerRNA value)
#else
void rna_def_brush(BlenderRNA *brna)
static void rna_def_brush(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_constraint.c
View File

@ -89,7 +89,7 @@ EnumPropertyItem space_object_items[] = {
#include "ED_object.h"
StructRNA *rna_ConstraintType_refine(struct PointerRNA *ptr)
static StructRNA *rna_ConstraintType_refine(struct PointerRNA *ptr)
{
bConstraint *con= (bConstraint*)ptr->data;

2
source/blender/makesrna/intern/rna_curve.c
View File

@ -66,7 +66,7 @@ EnumPropertyItem beztriple_keyframe_type_items[] = {
#include "WM_api.h"
StructRNA *rna_Curve_refine(PointerRNA *ptr)
static StructRNA *rna_Curve_refine(PointerRNA *ptr)
{
Curve *cu= (Curve*)ptr->data;
short obtype= curve_type(cu);

6
source/blender/makesrna/intern/rna_define.c
View File

@ -66,7 +66,7 @@ void rna_addtail(ListBase *listbase, void *vlink)
listbase->last = link;
}
void rna_remlink(ListBase *listbase, void *vlink)
static void rna_remlink(ListBase *listbase, void *vlink)
{
Link *link= vlink;
@ -155,7 +155,7 @@ PropertyDefRNA *rna_find_struct_property_def(StructRNA *srna, PropertyRNA *prop)
return NULL;
}
PropertyDefRNA *rna_find_property_def(PropertyRNA *prop)
static PropertyDefRNA *rna_find_property_def(PropertyRNA *prop)
{
PropertyDefRNA *dprop;
@ -239,7 +239,7 @@ PropertyDefRNA *rna_find_parameter_def(PropertyRNA *parm)
return NULL;
}
ContainerDefRNA *rna_find_container_def(ContainerRNA *cont)
static ContainerDefRNA *rna_find_container_def(ContainerRNA *cont)
{
StructDefRNA *ds;
FunctionDefRNA *dfunc;

10
source/blender/makesrna/intern/rna_fcurve.c
View File

@ -52,7 +52,7 @@ EnumPropertyItem fmodifier_type_items[] = {
/* --------- */
StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
{
FModifier *fcm= (FModifier *)ptr->data;
@ -460,7 +460,7 @@ static void rna_def_fmodifier_noise(BlenderRNA *brna)
/* --------- */
void rna_def_fmodifier(BlenderRNA *brna)
static void rna_def_fmodifier(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -510,7 +510,7 @@ void rna_def_fmodifier(BlenderRNA *brna)
/* *********************** */
void rna_def_drivertarget(BlenderRNA *brna)
static void rna_def_drivertarget(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -536,7 +536,7 @@ void rna_def_drivertarget(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "RNA Array Index", "Index to the specific property used (if applicable)");
}
void rna_def_channeldriver(BlenderRNA *brna)
static void rna_def_channeldriver(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -590,7 +590,7 @@ static void rna_def_fpoint(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Point", "Point coordinates");
}
void rna_def_fcurve(BlenderRNA *brna)
static void rna_def_fcurve(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

12
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -48,7 +48,7 @@ static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr)
return 1;
}
void rna_GPencilLayer_active_set(PointerRNA *ptr, int value)
static void rna_GPencilLayer_active_set(PointerRNA *ptr, int value)
{
bGPdata *gpd= ptr->id.data;
bGPDlayer *gpl= ptr->data;
@ -68,7 +68,7 @@ void rna_GPencilLayer_active_set(PointerRNA *ptr, int value)
#else
void rna_def_gpencil_stroke_point(BlenderRNA *brna)
static void rna_def_gpencil_stroke_point(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -88,7 +88,7 @@ void rna_def_gpencil_stroke_point(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Pressure", "Pressure of tablet at point when drawing it.");
}
void rna_def_gpencil_stroke(BlenderRNA *brna)
static void rna_def_gpencil_stroke(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -107,7 +107,7 @@ void rna_def_gpencil_stroke(BlenderRNA *brna)
// TODO...
}
void rna_def_gpencil_frame(BlenderRNA *brna)
static void rna_def_gpencil_frame(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -138,7 +138,7 @@ void rna_def_gpencil_frame(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Selected", "Frame is selected for editing in the DopeSheet.");
}
void rna_def_gpencil_layer(BlenderRNA *brna)
static void rna_def_gpencil_layer(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -215,7 +215,7 @@ void rna_def_gpencil_layer(BlenderRNA *brna)
}
void rna_def_gpencil_data(BlenderRNA *brna)
static void rna_def_gpencil_data(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_group.c
View File

@ -33,7 +33,7 @@
#ifdef RNA_RUNTIME
PointerRNA rna_Group_objects_get(CollectionPropertyIterator *iter)
static PointerRNA rna_Group_objects_get(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal= iter->internal;

4
source/blender/makesrna/intern/rna_main_api.c
View File

@ -40,14 +40,14 @@
#include "DNA_mesh_types.h"
Mesh *rna_Main_add_mesh(Main *main, char *name)
static Mesh *rna_Main_add_mesh(Main *main, char *name)
{
Mesh *me= add_mesh(name);
me->id.us--;
return me;
}
void rna_Main_remove_mesh(Main *main, ReportList *reports, Mesh *me)
static void rna_Main_remove_mesh(Main *main, ReportList *reports, Mesh *me)
{
if(me->id.us == 0)
free_libblock(&main->mesh, me);

8
source/blender/makesrna/intern/rna_material.c
View File

@ -212,7 +212,7 @@ static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value)
ma->ramp_spec= add_colorband(0);
}
void rna_Material_use_nodes_set(PointerRNA *ptr, int value)
static void rna_Material_use_nodes_set(PointerRNA *ptr, int value)
{
Material *ma= (Material*)ptr->data;
@ -1267,7 +1267,7 @@ static void rna_def_material_sss(BlenderRNA *brna)
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
}
void rna_def_material_specularity(StructRNA *srna)
static void rna_def_material_specularity(StructRNA *srna)
{
PropertyRNA *prop;
@ -1327,7 +1327,7 @@ void rna_def_material_specularity(StructRNA *srna)
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
}
void rna_def_material_strand(BlenderRNA *brna)
static void rna_def_material_strand(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -1394,7 +1394,7 @@ void rna_def_material_strand(BlenderRNA *brna)
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
}
void rna_def_material_physics(BlenderRNA *brna)
static void rna_def_material_physics(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

4
source/blender/makesrna/intern/rna_meta.c
View File

@ -67,7 +67,7 @@ static void rna_MetaBall_update_data(bContext *C, PointerRNA *ptr)
#else
void rna_def_metaelement(BlenderRNA *brna)
static void rna_def_metaelement(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -143,7 +143,7 @@ void rna_def_metaelement(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_MetaBall_update_data");
}
void rna_def_metaball(BlenderRNA *brna)
static void rna_def_metaball(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

6
source/blender/makesrna/intern/rna_nla.c
View File

@ -47,7 +47,7 @@
/* temp constant defined for these funcs only... */
#define NLASTRIP_MIN_LEN_THRESH 0.1f
void rna_NlaStrip_name_set(PointerRNA *ptr, const char *value)
static void rna_NlaStrip_name_set(PointerRNA *ptr, const char *value)
{
NlaStrip *data= (NlaStrip *)ptr->data;
@ -280,7 +280,7 @@ EnumPropertyItem nla_mode_extend_items[] = {
{NLASTRIP_EXTEND_HOLD_FORWARD, "HOLD_FORWARD", 0, "Hold Forward", "Only hold last frame."},
{0, NULL, 0, NULL, NULL}};
void rna_def_nlastrip(BlenderRNA *brna)
static void rna_def_nlastrip(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -433,7 +433,7 @@ void rna_def_nlastrip(BlenderRNA *brna)
// - sync length
}
void rna_def_nlatrack(BlenderRNA *brna)
static void rna_def_nlatrack(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -39,7 +39,7 @@
#ifdef RNA_RUNTIME
StructRNA *rna_Node_refine(struct PointerRNA *ptr)
static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
{
bNode *node = (bNode*)ptr->data;

2
source/blender/makesrna/intern/rna_object_api.c
View File

@ -43,7 +43,7 @@
#include "DNA_scene_types.h"
/* copied from init_render_mesh (render code) */
Mesh *rna_Object_create_render_mesh(Object *ob, Scene *scene)
static Mesh *rna_Object_create_render_mesh(Object *ob, Scene *scene)
{
CustomDataMask mask = CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL;
DerivedMesh *dm;

10
source/blender/makesrna/intern/rna_pose.c
View File

@ -98,7 +98,7 @@ static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value)
}
}
IDProperty *rna_PoseChannel_idproperties(PointerRNA *ptr, int create)
static IDProperty *rna_PoseChannel_idproperties(PointerRNA *ptr, int create)
{
bPoseChannel *pchan= ptr->data;
@ -323,7 +323,7 @@ static void rna_Pose_active_bone_group_index_range(PointerRNA *ptr, int *min, in
*max= MAX2(0, *max);
}
void rna_pose_bgroup_name_index_get(PointerRNA *ptr, char *value, int index)
static void rna_pose_bgroup_name_index_get(PointerRNA *ptr, char *value, int index)
{
bPose *pose= (bPose*)ptr->data;
bActionGroup *grp;
@ -334,7 +334,7 @@ void rna_pose_bgroup_name_index_get(PointerRNA *ptr, char *value, int index)
else BLI_strncpy(value, "", sizeof(grp->name)); // XXX if invalid pointer, won't this crash?
}
int rna_pose_bgroup_name_index_length(PointerRNA *ptr, int index)
static int rna_pose_bgroup_name_index_length(PointerRNA *ptr, int index)
{
bPose *pose= (bPose*)ptr->data;
bActionGroup *grp;
@ -343,7 +343,7 @@ int rna_pose_bgroup_name_index_length(PointerRNA *ptr, int index)
return (grp)? strlen(grp->name): 0;
}
void rna_pose_bgroup_name_index_set(PointerRNA *ptr, const char *value, short *index)
static void rna_pose_bgroup_name_index_set(PointerRNA *ptr, const char *value, short *index)
{
bPose *pose= (bPose*)ptr->data;
bActionGroup *grp;
@ -359,7 +359,7 @@ void rna_pose_bgroup_name_index_set(PointerRNA *ptr, const char *value, short *i
*index= 0;
}
void rna_pose_pgroup_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
static void rna_pose_pgroup_name_set(PointerRNA *ptr, const char *value, char *result, int maxlen)
{
bPose *pose= (bPose*)ptr->data;
bActionGroup *grp;

6
source/blender/makesrna/intern/rna_scene.c
View File

@ -70,7 +70,7 @@ EnumPropertyItem prop_mode_items[] ={
#include "RE_pipeline.h"
PointerRNA rna_Scene_objects_get(CollectionPropertyIterator *iter)
static PointerRNA rna_Scene_objects_get(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal= iter->internal;
@ -371,7 +371,7 @@ static void rna_SceneRenderLayer_pass_update(bContext *C, PointerRNA *ptr)
ntreeCompositForceHidden(scene->nodetree, scene);
}
void rna_Scene_use_nodes_set(PointerRNA *ptr, int value)
static void rna_Scene_use_nodes_set(PointerRNA *ptr, int value)
{
Scene *scene= (Scene*)ptr->data;
@ -784,7 +784,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
}
void rna_def_scene_game_data(BlenderRNA *brna)
static void rna_def_scene_game_data(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

30
source/blender/makesrna/intern/rna_sensor.c
View File

@ -73,7 +73,7 @@ static StructRNA* rna_Sensor_refine(struct PointerRNA *ptr)
#else
void rna_def_sensor(BlenderRNA *brna)
static void rna_def_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -129,14 +129,14 @@ void rna_def_sensor(BlenderRNA *brna)
RNA_def_property_range(prop, 0, 10000);
}
void rna_def_always_sensor(BlenderRNA *brna)
static void rna_def_always_sensor(BlenderRNA *brna)
{
StructRNA *srna;
srna= RNA_def_struct(brna, "AlwaysSensor", "Sensor");
RNA_def_struct_ui_text(srna, "Always Sensor", "Sensor to generate continuous pulses.");
}
void rna_def_near_sensor(BlenderRNA *brna)
static void rna_def_near_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -160,7 +160,7 @@ void rna_def_near_sensor(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0f, 10000.0f);
}
void rna_def_mouse_sensor(BlenderRNA *brna)
static void rna_def_mouse_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -186,7 +186,7 @@ void rna_def_mouse_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Mouse Event", "Specify the type of event this mouse sensor should trigger on.");
}
void rna_def_touch_sensor(BlenderRNA *brna)
static void rna_def_touch_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -201,7 +201,7 @@ void rna_def_touch_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Material", "Only look for floors with this material.");
}
void rna_def_keyboard_sensor(BlenderRNA *brna)
static void rna_def_keyboard_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -240,7 +240,7 @@ void rna_def_keyboard_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "All Keys", "Trigger this sensor on any keystroke.");
}
void rna_def_property_sensor(BlenderRNA *brna)
static void rna_def_property_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -278,7 +278,7 @@ void rna_def_property_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Maximum Value", "Specify maximum value in Interval type.");
}
void rna_def_actuator_sensor(BlenderRNA *brna)
static void rna_def_actuator_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -292,7 +292,7 @@ void rna_def_actuator_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Actuator", "Actuator name, actuator active state modifications will be detected.");
}
void rna_def_delay_sensor(BlenderRNA *brna)
static void rna_def_delay_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -314,7 +314,7 @@ void rna_def_delay_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Repeat", "Toggle repeat option. If selected, the sensor restarts after Delay+Dur logic tics.");
}
void rna_def_collision_sensor(BlenderRNA *brna)
static void rna_def_collision_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -341,7 +341,7 @@ void rna_def_collision_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Collision Type", "Toggle collision on material or property.");
}
void rna_def_radar_sensor(BlenderRNA *brna)
static void rna_def_radar_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -376,7 +376,7 @@ void rna_def_radar_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Distance", "Depth of the radar cone.");
}
void rna_def_random_sensor(BlenderRNA *brna)
static void rna_def_random_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -390,7 +390,7 @@ void rna_def_random_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Seed", "Initial seed of the generator. (Choose 0 for not random).");
}
void rna_def_ray_sensor(BlenderRNA *brna)
static void rna_def_ray_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -438,7 +438,7 @@ void rna_def_ray_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Axis", "Specify along which axis the ray is cast.");
}
void rna_def_message_sensor(BlenderRNA *brna)
static void rna_def_message_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@ -451,7 +451,7 @@ void rna_def_message_sensor(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Subject", "Optional subject filter: only accept messages with this subject, or empty for all.");
}
void rna_def_joystick_sensor(BlenderRNA *brna)
static void rna_def_joystick_sensor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

2
source/blender/makesrna/intern/rna_sequence.c
View File

@ -514,7 +514,7 @@ static void rna_def_sequence(BlenderRNA *brna)
RNA_def_function_return(func, RNA_def_pointer(func, "elem", "SequenceElement", "", "strip element of the current frame"));
}
void rna_def_editor(BlenderRNA *brna)
static void rna_def_editor(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;

10
source/blender/makesrna/intern/rna_space.c
View File

@ -211,7 +211,7 @@ static EnumPropertyItem *rna_SpaceImageEditor_draw_channels_itemf(bContext *C, P
/* Space Text Editor */
void rna_SpaceTextEditor_word_wrap_set(PointerRNA *ptr, int value)
static void rna_SpaceTextEditor_word_wrap_set(PointerRNA *ptr, int value)
{
SpaceText *st= (SpaceText*)(ptr->data);
@ -219,7 +219,7 @@ void rna_SpaceTextEditor_word_wrap_set(PointerRNA *ptr, int value)
st->left= 0;
}
void rna_SpaceTextEditor_text_set(PointerRNA *ptr, PointerRNA value)
static void rna_SpaceTextEditor_text_set(PointerRNA *ptr, PointerRNA value)
{
SpaceText *st= (SpaceText*)(ptr->data);
@ -227,7 +227,7 @@ void rna_SpaceTextEditor_text_set(PointerRNA *ptr, PointerRNA value)
st->top= 0;
}
void rna_SpaceFileBrowser_params_set(PointerRNA *ptr, PointerRNA value)
static void rna_SpaceFileBrowser_params_set(PointerRNA *ptr, PointerRNA value)
{
SpaceFile *sfile= (SpaceFile*)(ptr->data);
@ -236,7 +236,7 @@ void rna_SpaceFileBrowser_params_set(PointerRNA *ptr, PointerRNA value)
/* Space Properties */
StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr)
static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr)
{
SpaceButs *sbuts= (SpaceButs*)(ptr->data);
@ -246,7 +246,7 @@ StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr)
return &RNA_ID;
}
void rna_SpaceProperties_align_set(PointerRNA *ptr, int value)
static void rna_SpaceProperties_align_set(PointerRNA *ptr, int value)
{
SpaceButs *sbuts= (SpaceButs*)(ptr->data);

4
source/blender/makesrna/intern/rna_texture.c
View File

@ -55,7 +55,7 @@ static EnumPropertyItem texture_filter_items[] = {
#include "BKE_texture.h"
#include "ED_node.h"
StructRNA *rna_Texture_refine(struct PointerRNA *ptr)
static StructRNA *rna_Texture_refine(struct PointerRNA *ptr)
{
Tex *tex= (Tex*)ptr->data;
@ -202,7 +202,7 @@ static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value)
tex->coba= add_colorband(0);
}
void rna_Texture_use_nodes_set(PointerRNA *ptr, int v)
static void rna_Texture_use_nodes_set(PointerRNA *ptr, int v)
{
Tex *tex= (Tex*)ptr->data;

2
source/blender/makesrna/intern/rna_wm.c
View File

@ -197,7 +197,7 @@ static StructRNA *rna_OperatorProperties_refine(PointerRNA *ptr)
return ptr->type;
}
IDProperty *rna_OperatorProperties_idproperties(PointerRNA *ptr, int create)
static IDProperty *rna_OperatorProperties_idproperties(PointerRNA *ptr, int create)
{
if(create && !ptr->data) {
IDPropertyTemplate val = {0};

2
source/blender/windowmanager/intern/wm_operators.c
View File

@ -747,7 +747,7 @@ static int wm_search_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
}
/* op->poll */
int wm_search_menu_poll(bContext *C)
static int wm_search_menu_poll(bContext *C)
{
if(CTX_wm_window(C)==NULL) return 0;
if(CTX_wm_area(C) && CTX_wm_area(C)->spacetype==SPACE_CONSOLE) return 0; // XXX - so we can use the shortcut in the console