diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 10 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 2 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_image.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/TEX_util.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_driver.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/imagetexture.c | 3 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_files.h | 2 |
14 files changed, 21 insertions, 16 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 462ecebc10a..a989b1a1e9a 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -56,15 +56,15 @@ #define BLF_MAX_FONT 16 /* Font array. */ -FontBLF *global_font[BLF_MAX_FONT]; +static FontBLF *global_font[BLF_MAX_FONT]; /* Number of font. */ -int global_font_num= 0; +static int global_font_num= 0; /* Default size and dpi, for BLF_draw_default. */ -int global_font_default= -1; -int global_font_points= 11; -int global_font_dpi= 72; +static int global_font_default= -1; +static int global_font_points= 11; +static int global_font_dpi= 72; // XXX, should these be made into global_font_'s too? int blf_mono_font= -1; diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index ce68df5c8b6..da78c2427b6 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -53,7 +53,7 @@ /* freetype2 handle. */ -FT_Library global_ft_lib; +static FT_Library global_ft_lib; int blf_font_init(void) { diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 8d13975b83a..3639f598c10 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -51,7 +51,7 @@ #include "blf_internal_types.h" #include "blf_internal.h" -FT_Library global_ft_lib; +static FT_Library global_ft_lib; GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi) { diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 014a15de1ef..e946ce06aa2 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -214,7 +214,7 @@ static int append_avi(RenderData *UNUSED(rd), int frame, int *pixels, int rectx, return 1; } -void end_avi(void) +static void end_avi(void) { if (avi == NULL) return; diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 227b6327d64..b506aae4747 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -2357,7 +2357,7 @@ typedef struct RNAProcessItem { void (*define)(BlenderRNA *brna); } RNAProcessItem; -RNAProcessItem PROCESS_ITEMS[]= { +static RNAProcessItem PROCESS_ITEMS[]= { {"rna_rna.c", NULL, RNA_def_rna}, {"rna_ID.c", NULL, RNA_def_ID}, {"rna_texture.c", NULL, RNA_def_texture}, diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c index d5176bf6816..5c39e6ea159 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c @@ -339,7 +339,7 @@ static CompBuf *compbuf_from_pass(RenderData *rd, RenderLayer *rl, int rectx, in return NULL; }; -void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStack **out, int rectx, int recty) +static void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStack **out, int rectx, int recty) { if(out[RRES_OUT_Z]->hasoutput) out[RRES_OUT_Z]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_Z); diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c index d288b13a66c..60f4cf5aef4 100644 --- a/source/blender/nodes/intern/TEX_util.c +++ b/source/blender/nodes/intern/TEX_util.c @@ -57,7 +57,7 @@ void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, short thr } } -void tex_input(float *out, int sz, bNodeStack *in, TexParams *params, short thread) +static void tex_input(float *out, int sz, bNodeStack *in, TexParams *params, short thread) { TexDelegate *dg = in->data; if(dg) { diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index 161b56d39aa..2b49f78929a 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -34,6 +34,8 @@ #include "BKE_fcurve.h" #include "BKE_global.h" +#include "bpy_driver.h" + /* for pydrivers (drivers using one-line Python expressions to express relationships between targets) */ PyObject *bpy_pydriver_Dict = NULL; diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 3a8270a757e..ca4c6935a4c 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -53,13 +53,14 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" - #include "BKE_global.h" #include "BKE_main.h" #include "BKE_image.h" #include "BKE_texture.h" #include "BKE_library.h" +#include "RE_render_ext.h" + #include "renderpipeline.h" #include "render_types.h" #include "texture.h" diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 15279fea01d..1325fd89ec6 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -50,6 +50,7 @@ #include "render_types.h" #include "renderdatabase.h" #include "texture.h" +#include "pointdensity.h" /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */ @@ -325,7 +326,7 @@ typedef struct PointDensityRangeData int offset; } PointDensityRangeData; -void accum_density(void *userdata, int index, float squared_dist) +static void accum_density(void *userdata, int index, float squared_dist) { PointDensityRangeData *pdr = (PointDensityRangeData *)userdata; const float dist = (pdr->squared_radius - squared_dist) / pdr->squared_radius * 0.5f; diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index f0a416e1c6e..d9d9de3f9e9 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -70,7 +70,7 @@ static GHOST_TStandardCursor convert_cursor(int curs) } } -void window_set_custom_cursor(wmWindow *win, unsigned char mask[16][2], +static void window_set_custom_cursor(wmWindow *win, unsigned char mask[16][2], unsigned char bitmap[16][2], int hotx, int hoty) { GHOST_SetCustomCursorShape(win->ghostwin, bitmap, mask, hotx, hoty); diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 6bdb45c3220..526e9bf029b 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -809,7 +809,7 @@ void wm_draw_region_clear(wmWindow *win, ARegion *ar) win->screen->do_draw= 1; } -void wm_draw_region_modified(wmWindow *win, ARegion *ar) +static void wm_draw_region_modified(wmWindow *win, ARegion *ar) { int drawmethod= wm_automatic_draw_method(win); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 07448c400f4..b54e70a7640 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -105,6 +105,7 @@ #include "WM_api.h" #include "WM_types.h" #include "wm.h" +#include "wm_files.h" #include "wm_window.h" #include "wm_event_system.h" diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index d80c8ab7f8d..6a07218bebd 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -28,7 +28,7 @@ #ifndef WM_FILES_H #define WM_FILES_H -extern void WM_read_history(void); +void WM_read_history(void); #endif /* WM_FILES_H */ |