[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39744] trunk/blender: - use static vars and functions where possible.
Campbell Barton
ideasman42 at gmail.com
Sun Aug 28 07:06:30 CEST 2011
Revision: 39744
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39744
Author: campbellbarton
Date: 2011-08-28 05:06:30 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
- use static vars and functions where possible.
- use NULL rather than 0 when used as pointers.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/callbacks.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/python/intern/bpy_intern_string.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -429,7 +429,7 @@
return -1;
}
-void MEM_printmemlist_stats()
+void MEM_printmemlist_stats(void)
{
MemHead *membl;
MemPrintBlock *pb, *printblock;
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -515,7 +515,7 @@
return NULL;
}
-void data_delete_material_index_id(ID *id, int index)
+static void data_delete_material_index_id(ID *id, int index)
{
switch(GS(id->name)) {
case ID_ME:
@@ -1365,7 +1365,7 @@
}
/* copy/paste buffer, if we had a propper py api that would be better */
-Material matcopybuf;
+static Material matcopybuf;
static short matcopied= 0;
void clear_matcopybuf(void)
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -2873,7 +2873,7 @@
{
Editing * ed;
ListBase * seqbasep;
- struct ImBuf * i = 0;
+ struct ImBuf * i= NULL;
ed = context.scene->ed;
@@ -2908,7 +2908,7 @@
struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
struct ImBuf *UNUSED(ibuf3))
{
- struct ImBuf * i = 0;
+ struct ImBuf * i = NULL;
struct ImBuf * out;
Editing * ed;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -40,7 +40,7 @@
#include "BLO_sys_types.h" // for intptr_t support
/***/
-unsigned int hashsizes[]= {
+static unsigned int hashsizes[]= {
5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209,
16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169,
4194319, 8388617, 16777259, 33554467, 67108879, 134217757,
Modified: trunk/blender/source/blender/blenlib/intern/callbacks.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/callbacks.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/blenlib/intern/callbacks.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -28,7 +28,7 @@
#include "MEM_guardedalloc.h"
-static ListBase callback_slots[BLI_CB_EVT_TOT]= {{0}};
+static ListBase callback_slots[BLI_CB_EVT_TOT]= {{NULL}};
void BLI_exec_cb(struct Main *main, struct ID *self, eCbEvent evt)
{
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -1361,7 +1361,7 @@
static void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt)
{
MenuType *mt= (MenuType*)arg_mt;
- Menu menu = {0};
+ Menu menu = {NULL};
menu.type= mt;
menu.layout= layout;
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -3988,7 +3988,7 @@
{
PTCacheUndo *undo;
- if(edit==0) return;
+ if(edit==NULL) return;
undo= edit->undo.first;
while(undo) {
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -64,6 +64,7 @@
#include "DNA_brush_types.h"
#include "DNA_screen_types.h"
+#include "BKE_brush.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -1702,7 +1702,7 @@
return OPERATOR_RUNNING_MODAL;
}
-int region_scale_cancel(bContext *UNUSED(C), wmOperator *op)
+static int region_scale_cancel(bContext *UNUSED(C), wmOperator *op)
{
MEM_freeN(op->customdata);
op->customdata = NULL;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -231,7 +231,7 @@
}
/* Find ith item from the treestore */
-TreeElement *outliner_find_tree_element(ListBase *lb, int store_index)
+static TreeElement *outliner_find_tree_element(ListBase *lb, int store_index)
{
TreeElement *te= lb->first, *tes;
while(te) {
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -700,7 +700,7 @@
}
}
-static Sequence *special_seq_update= 0;
+static Sequence *special_seq_update= NULL;
static void UNUSED_FUNCTION(set_special_seq_update)(int val)
{
@@ -710,14 +710,14 @@
if(val) {
// XXX special_seq_update= find_nearest_seq(&x);
}
- else special_seq_update= 0;
+ else special_seq_update= NULL;
}
void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs)
{
struct Main *bmain= CTX_data_main(C);
- struct ImBuf *ibuf = 0;
- struct ImBuf *scope = 0;
+ struct ImBuf *ibuf= NULL;
+ struct ImBuf *scope= NULL;
struct View2D *v2d = &ar->v2d;
int rectx, recty;
float viewrectx, viewrecty;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -846,7 +846,7 @@
for(seq= ed->seqbasep->first; seq; seq= seq->next) {
seq_rectf(seq, &rq);
- if(BLI_isect_rctf(&rq, &rectf, 0)) {
+ if(BLI_isect_rctf(&rq, &rectf, NULL)) {
if(selecting) seq->flag |= SELECT;
else seq->flag &= ~SEQ_ALLSEL;
recurs_sel_seq(seq);
Modified: trunk/blender/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -82,7 +82,7 @@
} GPUDataSource;
static const char* GPU_DATATYPE_STR[17] = {"", "float", "vec2", "vec3", "vec4",
- 0, 0, 0, 0, "mat3", 0, 0, 0, 0, 0, 0, "mat4"};
+ NULL, NULL, NULL, NULL, "mat3", NULL, NULL, NULL, NULL, NULL, NULL, "mat4"};
struct GPUNode {
struct GPUNode *next, *prev;
@@ -451,7 +451,7 @@
else if(input->ima)
return 1;
else
- return input->tex != 0;
+ return input->tex != NULL;
}
const char *GPU_builtin_name(GPUBuiltin builtin)
@@ -880,7 +880,7 @@
GPU_texture_unbind(input->tex);
if (input->ima)
- input->tex = 0;
+ input->tex = NULL;
}
GPU_shader_unbind(shader);
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -308,7 +308,7 @@
}
}
-float GPU_get_anisotropic()
+float GPU_get_anisotropic(void)
{
return GTS.anisotropic;
}
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -484,7 +484,7 @@
//if (fpixels)
// pixels = GPU_texture_convert_pixels(w*h*depth, fpixels);
- glTexImage3D(tex->target, 0, internalformat, tex->w, tex->h, tex->depth, 0, format, type, 0);
+ glTexImage3D(tex->target, 0, internalformat, tex->w, tex->h, tex->depth, 0, format, type, NULL);
GPU_print_error("3D glTexImage3D");
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-08-28 05:01:16 UTC (rev 39743)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-08-28 05:06:30 UTC (rev 39744)
@@ -137,18 +137,18 @@
""
};
-int maxdata= 500000, maxnr= 50000;
-int nr_names=0;
-int nr_types=0;
-int nr_structs=0;
-char **names, *namedata; /* at address names[a] is string a */
-char **types, *typedata; /* at address types[a] is string a */
-short *typelens; /* at typelens[a] is de length of type a */
-short *alphalens; /* contains sizes as they are calculated on the DEC Alpha (64 bits) */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list