more vars made static
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 Feb 2011 18:20:10 +0000 (18:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 Feb 2011 18:20:10 +0000 (18:20 +0000)
14 files changed:
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenkernel/intern/writeavi.c
source/blender/makesrna/intern/makesrna.c
source/blender/nodes/intern/CMP_nodes/CMP_image.c
source/blender/nodes/intern/TEX_util.c
source/blender/python/intern/bpy_driver.c
source/blender/render/intern/source/imagetexture.c
source/blender/render/intern/source/pointdensity.c
source/blender/windowmanager/intern/wm_cursors.c
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/wm_files.h

index 462ecebc10a9bffa9c76da4468bbc0077ea0efd4..a989b1a1e9a9350947a846802131e52ef9c9031e 100644 (file)
 #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;
index ce68df5c8b6e09446150c325ae4eba7fa4099a00..da78c2427b6286b06de4faaf25d729cec52c607d 100644 (file)
@@ -53,7 +53,7 @@
 
 
 /* freetype2 handle. */
-FT_Library global_ft_lib;
+static FT_Library global_ft_lib;
 
 int blf_font_init(void)
 {
index 8d13975b83a7c9f41b13cdcb6777ff2ea2d476c2..3639f598c10cf60c55e2e7e5ce567ceb6ef3b51d 100644 (file)
@@ -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)
 {
index 014a15de1efd8a62ad683b52f96c1865319a74a4..e946ce06aa2435e1178c1f3ca419c5c545ab605d 100644 (file)
@@ -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;
 
index 227b6327d64dad02cf071b7b7417b728c4b0b138..b506aae4747a002e656233a357472d47256ad4e6 100644 (file)
@@ -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},
index d5176bf681638473533e621a03ae9ae485bc7f1d..5c39e6ea159036045b7155ece57676df2645f32c 100644 (file)
@@ -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);
index d288b13a66cd44351deebb059893b1e34b22bb72..60f4cf5aef49d82d91f484bdd6ec76066a020b21 100644 (file)
@@ -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) {
index 161b56d39aac832fe82176dae706d775b1d3262c..2b49f78929ae76c3843ae1477522cf5c546e3960 100644 (file)
@@ -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;
 
index 3a8270a757ec1f4b87e3b657a09d54a9e6a41a57..ca4c6935a4c9a911e45b25198f29c48bb2283ab2 100644 (file)
 #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"
index 15279fea01dd7881aa1355d8cf99c3bd2a8bc778..1325fd89ec6e27e8fb308b8aaf2af420c6bd120d 100644 (file)
@@ -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;
index f0a416e1c6ee3cb44d5795163bde52b177d7e129..d9d9de3f9e92f9132cf5c4fc15306e067cc77dd9 100644 (file)
@@ -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);
index 6bdb45c32204e9b86b0cb644151068fc60b30b4d..526e9bf029b47551df73d827a2a8bece865361c9 100644 (file)
@@ -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);
 
index 07448c400f4804f245ba99336ea29884599dfff9..b54e70a7640a4234785dab0b83a969e077d8dd82 100644 (file)
 #include "WM_api.h"
 #include "WM_types.h"
 #include "wm.h"
+#include "wm_files.h"
 #include "wm_window.h"
 #include "wm_event_system.h"
 
index d80c8ab7f8dfa835642f0d7e5f260f0e654200b5..6a07218bebd1459f0a2fc7c69def49c599fcc338 100644 (file)
@@ -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 */