[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34853] trunk/blender/source/blender: more vars made static
Campbell Barton
ideasman42 at gmail.com
Mon Feb 14 19:20:13 CET 2011
Revision: 34853
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34853
Author: campbellbarton
Date: 2011-02-14 18:20:10 +0000 (Mon, 14 Feb 2011)
Log Message:
-----------
more vars made static
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf.c
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/wm_files.h
Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/blenfont/intern/blf.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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;
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -53,7 +53,7 @@
/* freetype2 handle. */
-FT_Library global_ft_lib;
+static FT_Library global_ft_lib;
int blf_font_init(void)
{
Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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)
{
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -214,7 +214,7 @@
return 1;
}
-void end_avi(void)
+static void end_avi(void)
{
if (avi == NULL) return;
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -2357,7 +2357,7 @@
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},
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -339,7 +339,7 @@
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);
Modified: trunk/blender/source/blender/nodes/intern/TEX_util.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_util.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/nodes/intern/TEX_util.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -57,7 +57,7 @@
}
}
-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) {
Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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;
Modified: trunk/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/imagetexture.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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"
Modified: trunk/blender/source/blender/render/intern/source/pointdensity.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pointdensity.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/render/intern/source/pointdensity.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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 @@
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;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -70,7 +70,7 @@
}
}
-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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_draw.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -809,7 +809,7 @@
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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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"
Modified: trunk/blender/source/blender/windowmanager/wm_files.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_files.h 2011-02-14 18:18:46 UTC (rev 34852)
+++ trunk/blender/source/blender/windowmanager/wm_files.h 2011-02-14 18:20:10 UTC (rev 34853)
@@ -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 */
More information about the Bf-blender-cvs
mailing list