archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

many functions in blender are not marked static but should be.

Browse Source 
most local modifier,GPU,ImBuf and Interface functions are now static.

also fixed an error were the fluid modifier definition and the header didnt have the same number of args.
This commit is contained in:
Campbell Barton
2011-02-13 14:16:36 +00:00
parent 63cc6b44e7
commit 4124804b4e
54 changed files with 162 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/animation/anim_channels_edit.c
View File

@@ -577,7 +577,7 @@ enum {
}; };
/* defines for rearranging channels */ /* defines for rearranging channels */
EnumPropertyItem prop_animchannel_rearrange_types[] = { static EnumPropertyItem prop_animchannel_rearrange_types[] = {
{REARRANGE_ANIMCHAN_TOP, "TOP", 0, "To Top", ""}, {REARRANGE_ANIMCHAN_TOP, "TOP", 0, "To Top", ""},
{REARRANGE_ANIMCHAN_UP, "UP", 0, "Up", ""}, {REARRANGE_ANIMCHAN_UP, "UP", 0, "Up", ""},
{REARRANGE_ANIMCHAN_DOWN, "DOWN", 0, "Down", ""}, {REARRANGE_ANIMCHAN_DOWN, "DOWN", 0, "Down", ""},
@@ -1338,7 +1338,7 @@ static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot)
/* ********************** Set Flags Operator *********************** */ /* ********************** Set Flags Operator *********************** */
/* defines for setting animation-channel flags */ /* defines for setting animation-channel flags */
EnumPropertyItem prop_animchannel_setflag_types[] = { static EnumPropertyItem prop_animchannel_setflag_types[] = {
{ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""}, {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""},
{ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""}, {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""},
{ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""}, {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""},
@@ -1348,7 +1348,7 @@ EnumPropertyItem prop_animchannel_setflag_types[] = {
/* defines for set animation-channel settings */ /* defines for set animation-channel settings */
// TODO: could add some more types, but those are really quite dependent on the mode... // TODO: could add some more types, but those are really quite dependent on the mode...
EnumPropertyItem prop_animchannel_settings_types[] = { static EnumPropertyItem prop_animchannel_settings_types[] = {
{ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""}, {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""},
{ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""}, {ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""},
{0, NULL, 0, NULL, NULL} {0, NULL, 0, NULL, NULL}

2
source/blender/editors/animation/drivers.c
View File

@@ -75,7 +75,7 @@ void free_anim_drivers_copybuf (void);
* 1 - add new Driver FCurve, * 1 - add new Driver FCurve,
* -1 - add new Driver FCurve without driver stuff (for pasting) * -1 - add new Driver FCurve without driver stuff (for pasting)
*/ */
FCurve *verify_driver_fcurve (ID *id, const char rna_path[], const int array_index, short add) static FCurve *verify_driver_fcurve (ID *id, const char rna_path[], const int array_index, short add)
{ {
AnimData *adt; AnimData *adt;
FCurve *fcu; FCurve *fcu;

4
source/blender/editors/include/UI_interface.h
View File

@@ -760,6 +760,10 @@ void uiStyleFontDrawRotated(struct uiFontStyle *fs, struct rcti *rect, const cha
int UI_GetStringWidth(const char *str); // XXX temp int UI_GetStringWidth(const char *str); // XXX temp
void UI_DrawString(float x, float y, const char *str); // XXX temp void UI_DrawString(float x, float y, const char *str); // XXX temp
void UI_DrawTriIcon(float x, float y, char dir);
/* linker workaround ack! */
void UI_template_fix_linking(void);
#endif /* UI_INTERFACE_H */ #endif /* UI_INTERFACE_H */

4
source/blender/editors/interface/interface.c
View File

@@ -660,7 +660,7 @@ static void ui_menu_block_set_keyaccels(uiBlock *block)
} }
void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block) static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
{ {
uiBut *but; uiBut *but;
IDProperty *prop; IDProperty *prop;
@@ -919,7 +919,7 @@ static int uibut_contains_pt(uiBut *UNUSED(but), short *UNUSED(mval))
} }
uiBut *ui_get_valid_link_button(uiBlock *block, uiBut *but, short *mval) static uiBut *ui_get_valid_link_button(uiBlock *block, uiBut *but, short *mval)
{ {
uiBut *bt; uiBut *bt;

10
source/blender/editors/interface/interface_draw.c
View File

@@ -381,7 +381,7 @@ void uiRoundRect(float minx, float miny, float maxx, float maxy, float rad)
} }
/* plain fake antialiased unfilled round rectangle */ /* plain fake antialiased unfilled round rectangle */
void uiRoundRectFakeAA(float minx, float miny, float maxx, float maxy, float rad, float asp) static void uiRoundRectFakeAA(float minx, float miny, float maxx, float maxy, float rad, float asp)
{ {
float color[4], alpha; float color[4], alpha;
float raddiff; float raddiff;
@@ -715,7 +715,7 @@ static void draw_scope_end(rctf *rect, GLint *scissor)
uiDrawBox(GL_LINE_LOOP, rect->xmin-1, rect->ymin, rect->xmax+1, rect->ymax+1, 3.0f); uiDrawBox(GL_LINE_LOOP, rect->xmin-1, rect->ymin, rect->xmax+1, rect->ymax+1, 3.0f);
} }
void histogram_draw_one(float r, float g, float b, float alpha, float x, float y, float w, float h, float *data, int res) static void histogram_draw_one(float r, float g, float b, float alpha, float x, float y, float w, float h, float *data, int res)
{ {
int i; int i;
@@ -961,17 +961,17 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
draw_scope_end(&rect, scissor); draw_scope_end(&rect, scissor);
} }
float polar_to_x(float center, float diam, float ampli, float angle) static float polar_to_x(float center, float diam, float ampli, float angle)
{ {
return center + diam * ampli * cosf(angle); return center + diam * ampli * cosf(angle);
} }
float polar_to_y(float center, float diam, float ampli, float angle) static float polar_to_y(float center, float diam, float ampli, float angle)
{ {
return center + diam * ampli * sinf(angle); return center + diam * ampli * sinf(angle);
} }
void vectorscope_draw_target(float centerx, float centery, float diam, float r, float g, float b) static void vectorscope_draw_target(float centerx, float centery, float diam, float r, float g, float b)
{ {
float y,u,v; float y,u,v;
float tangle=0.f, tampli; float tangle=0.f, tampli;

2
source/blender/editors/interface/interface_handlers.c
View File

@@ -5467,7 +5467,7 @@ static int ui_mouse_motion_towards_check(uiBlock *block, uiPopupBlockHandle *men
return menu->dotowards; return menu->dotowards;
} }
int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, int UNUSED(topmenu)) static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, int UNUSED(topmenu))
{ {
ARegion *ar; ARegion *ar;
uiBlock *block; uiBlock *block;

5
source/blender/editors/interface/interface_layout.c
View File

@@ -1114,7 +1114,7 @@ typedef struct CollItemSearch {
int iconid; int iconid;
} CollItemSearch; } CollItemSearch;
int sort_search_items_list(void *a, void *b) static int sort_search_items_list(void *a, void *b)
{ {
CollItemSearch *cis1 = (CollItemSearch *)a; CollItemSearch *cis1 = (CollItemSearch *)a;
CollItemSearch *cis2 = (CollItemSearch *)b; CollItemSearch *cis2 = (CollItemSearch *)b;
@@ -2576,8 +2576,7 @@ void uiBlockLayoutResolve(uiBlock *block, int *x, int *y)
/* XXX silly trick, interface_templates.c doesn't get linked /* XXX silly trick, interface_templates.c doesn't get linked
* because it's not used by other files in this module? */ * because it's not used by other files in this module? */
{ {
void ui_template_fix_linking(void); UI_template_fix_linking();
ui_template_fix_linking();
} }
} }

12
source/blender/editors/interface/interface_ops.c
View File

@@ -177,7 +177,7 @@ static int eyedropper_poll(bContext *C)
else return 1; else return 1;
} }
void UI_OT_eyedropper(wmOperatorType *ot) static void UI_OT_eyedropper(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Eyedropper"; ot->name= "Eyedropper";
@@ -207,7 +207,7 @@ static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void UI_OT_reset_default_theme(wmOperatorType *ot) static void UI_OT_reset_default_theme(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Reset to Default Theme"; ot->name= "Reset to Default Theme";
@@ -247,7 +247,7 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *UNUSED(op))
return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
} }
void UI_OT_copy_data_path_button(wmOperatorType *ot) static void UI_OT_copy_data_path_button(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Copy Data Path"; ot->name= "Copy Data Path";
@@ -297,7 +297,7 @@ static int reset_default_button_exec(bContext *C, wmOperator *op)
return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
} }
void UI_OT_reset_default_button(wmOperatorType *ot) static void UI_OT_reset_default_button(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Reset to Default Value"; ot->name= "Reset to Default Value";
@@ -389,7 +389,7 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op)
return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED; return (success)? OPERATOR_FINISHED: OPERATOR_CANCELLED;
} }
void UI_OT_copy_to_selected_button(wmOperatorType *ot) static void UI_OT_copy_to_selected_button(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Copy To Selected"; ot->name= "Copy To Selected";
@@ -439,7 +439,7 @@ static int reports_to_text_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void UI_OT_reports_to_textblock(wmOperatorType *ot) static void UI_OT_reports_to_textblock(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Reports to Text Block"; ot->name= "Reports to Text Block";

12
source/blender/editors/interface/interface_panel.c
View File

@@ -309,7 +309,7 @@ static void ui_offset_panel_block(uiBlock *block)
/**************************** drawing *******************************/ /**************************** drawing *******************************/
/* extern used by previewrender */ /* extern used by previewrender */
void uiPanelPush(uiBlock *block) static void uiPanelPush(uiBlock *block)
{ {
glPushMatrix(); glPushMatrix();
@@ -317,14 +317,14 @@ void uiPanelPush(uiBlock *block)
glTranslatef((float)block->panel->ofsx, (float)block->panel->ofsy, 0.0); glTranslatef((float)block->panel->ofsx, (float)block->panel->ofsy, 0.0);
} }
void uiPanelPop(uiBlock *UNUSED(block)) static void uiPanelPop(uiBlock *UNUSED(block))
{ {
glPopMatrix(); glPopMatrix();
} }
/* triangle 'icon' for panel header */ /* triangle 'icon' for panel header */
/* NOTE - this seems to be only used for hiding nodes now */ /* NOTE - this seems to be only used for hiding nodes now */
void ui_draw_tria_icon(float x, float y, char dir) void UI_DrawTriIcon(float x, float y, char dir)
{ {
if(dir=='h') { if(dir=='h') {
ui_draw_anti_tria( x-3,y-5, x-3,y+5, x+7,y ); ui_draw_anti_tria( x-3,y-5, x-3,y+5, x+7,y );
@@ -335,7 +335,7 @@ void ui_draw_tria_icon(float x, float y, char dir)
} }
/* triangle 'icon' inside rect */ /* triangle 'icon' inside rect */
void ui_draw_tria_rect(rctf *rect, char dir) static void ui_draw_tria_rect(rctf *rect, char dir)
{ {
if(dir=='h') { if(dir=='h') {
float half= 0.5f*(rect->ymax - rect->ymin); float half= 0.5f*(rect->ymax - rect->ymin);
@@ -347,7 +347,7 @@ void ui_draw_tria_rect(rctf *rect, char dir)
} }
} }
void ui_draw_anti_x(float x1, float y1, float x2, float y2) static void ui_draw_anti_x(float x1, float y1, float x2, float y2)
{ {
/* set antialias line */ /* set antialias line */
@@ -655,7 +655,7 @@ static int compare_panel(const void *a1, const void *a2)
/* this doesnt draw */ /* this doesnt draw */
/* returns 1 when it did something */ /* returns 1 when it did something */
int uiAlignPanelStep(ScrArea *sa, ARegion *ar, float fac, int drag) static int uiAlignPanelStep(ScrArea *sa, ARegion *ar, float fac, int drag)
{ {
uiStyle *style= U.uistyles.first; uiStyle *style= U.uistyles.first;
Panel *pa; Panel *pa;

10
source/blender/editors/interface/interface_regions.c
View File

@@ -130,7 +130,7 @@ static void menudata_add_item(MenuData *md, const char *str, int retval, int ico
md->nitems++; md->nitems++;
} }
void menudata_free(MenuData *md) static void menudata_free(MenuData *md)
{ {
MEM_freeN(md->instr); MEM_freeN(md->instr);
if (md->items) if (md->items)
@@ -151,7 +151,7 @@ void menudata_free(MenuData *md)
* @param str String to be parsed. * @param str String to be parsed.
* @retval new menudata structure, free with menudata_free() * @retval new menudata structure, free with menudata_free()
*/ */
MenuData *decompose_menu_string(char *str) static MenuData *decompose_menu_string(char *str)
{ {
char *instr= BLI_strdup(str); char *instr= BLI_strdup(str);
MenuData *md= menudata_new(instr); MenuData *md= menudata_new(instr);
@@ -272,7 +272,7 @@ int ui_step_name_menu(uiBut *but, int step)
/******************** Creating Temporary regions ******************/ /******************** Creating Temporary regions ******************/
ARegion *ui_add_temporary_region(bScreen *sc) static ARegion *ui_add_temporary_region(bScreen *sc)
{ {
ARegion *ar; ARegion *ar;
@@ -285,7 +285,7 @@ ARegion *ui_add_temporary_region(bScreen *sc)
return ar; return ar;
} }
void ui_remove_temporary_region(bContext *C, bScreen *sc, ARegion *ar) static void ui_remove_temporary_region(bContext *C, bScreen *sc, ARegion *ar)
{ {
if(CTX_wm_window(C)) if(CTX_wm_window(C))
wm_draw_region_clear(CTX_wm_window(C), ar); wm_draw_region_clear(CTX_wm_window(C), ar);
@@ -1620,7 +1620,7 @@ void ui_set_but_hsv(uiBut *but)
} }
/* also used by small picker, be careful with name checks below... */ /* also used by small picker, be careful with name checks below... */
void ui_update_block_buts_rgb(uiBlock *block, float *rgb) static void ui_update_block_buts_rgb(uiBlock *block, float *rgb)
{ {
uiBut *bt; uiBut *bt;
float *hsv= ui_block_hsv_get(block); float *hsv= ui_block_hsv_get(block);

4
source/blender/editors/interface/interface_templates.c
View File

@@ -59,7 +59,7 @@
#include "BLF_api.h" #include "BLF_api.h"
void ui_template_fix_linking(void) void UI_template_fix_linking(void)
{ {
} }
@@ -876,7 +876,7 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr)
#define REMAKEIPO 8 #define REMAKEIPO 8
#define B_DIFF 9 #define B_DIFF 9
void do_constraint_panels(bContext *C, void *ob_pt, int event) static void do_constraint_panels(bContext *C, void *ob_pt, int event)
{ {
Main *bmain= CTX_data_main(C); Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C); Scene *scene= CTX_data_scene(C);

2
source/blender/editors/interface/interface_widgets.c
View File

@@ -1698,7 +1698,7 @@ void ui_hsvcircle_vals_from_pos(float *valrad, float *valdist, rcti *rect, float
*valrad= atan2(mx, my)/(2.0f*M_PI) + 0.5f; *valrad= atan2(mx, my)/(2.0f*M_PI) + 0.5f;
} }
void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect) static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect)
{ {
/* gouraud triangle fan */ /* gouraud triangle fan */
float radstep, ang= 0.0f; float radstep, ang= 0.0f;

22
source/blender/editors/interface/view2d_ops.c
View File

@@ -280,7 +280,7 @@ static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
void VIEW2D_OT_pan(wmOperatorType *ot) static void VIEW2D_OT_pan(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Pan View"; ot->name= "Pan View";
@@ -330,7 +330,7 @@ static int view_scrollright_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_scroll_right(wmOperatorType *ot) static void VIEW2D_OT_scroll_right(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Scroll Right"; ot->name= "Scroll Right";
@@ -374,7 +374,7 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_scroll_left(wmOperatorType *ot) static void VIEW2D_OT_scroll_left(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Scroll Left"; ot->name= "Scroll Left";
@@ -422,7 +422,7 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_scroll_down(wmOperatorType *ot) static void VIEW2D_OT_scroll_down(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Scroll Down"; ot->name= "Scroll Down";
@@ -472,7 +472,7 @@ static int view_scrollup_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_scroll_up(wmOperatorType *ot) static void VIEW2D_OT_scroll_up(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Scroll Up"; ot->name= "Scroll Up";
@@ -699,7 +699,7 @@ static int view_zoomin_invoke(bContext *C, wmOperator *op, wmEvent *event)
return view_zoomin_exec(C, op); return view_zoomin_exec(C, op);
} }
void VIEW2D_OT_zoom_in(wmOperatorType *ot) static void VIEW2D_OT_zoom_in(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Zoom In"; ot->name= "Zoom In";
@@ -756,7 +756,7 @@ static int view_zoomout_invoke(bContext *C, wmOperator *op, wmEvent *event)
return view_zoomout_exec(C, op); return view_zoomout_exec(C, op);
} }
void VIEW2D_OT_zoom_out(wmOperatorType *ot) static void VIEW2D_OT_zoom_out(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Zoom Out"; ot->name= "Zoom Out";
@@ -1040,7 +1040,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
return OPERATOR_RUNNING_MODAL; return OPERATOR_RUNNING_MODAL;
} }
void VIEW2D_OT_zoom(wmOperatorType *ot) static void VIEW2D_OT_zoom(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Zoom View"; ot->name= "Zoom View";
@@ -1140,7 +1140,7 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_zoom_border(wmOperatorType *ot) static void VIEW2D_OT_zoom_border(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Zoom to Border"; ot->name= "Zoom to Border";
@@ -1537,7 +1537,7 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event)
} }
/* LMB-Drag in Scrollers - not repeatable operator! */ /* LMB-Drag in Scrollers - not repeatable operator! */
void VIEW2D_OT_scroller_activate(wmOperatorType *ot) static void VIEW2D_OT_scroller_activate(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Scroller Activate"; ot->name= "Scroller Activate";
@@ -1603,7 +1603,7 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void VIEW2D_OT_reset(wmOperatorType *ot) static void VIEW2D_OT_reset(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Reset View"; ot->name= "Reset View";

5
source/blender/editors/space_node/node_draw.c
View File

@@ -69,7 +69,6 @@
// XXX interface.h // XXX interface.h
extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select); extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
extern void ui_draw_tria_icon(float x, float y, char dir);
void ED_node_changed_update(ID *id, bNode *node) void ED_node_changed_update(ID *id, bNode *node)
{ {
@@ -710,7 +709,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10); UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
/* open/close entirely? */ /* open/close entirely? */
ui_draw_tria_icon(rct->xmin+10.0f, rct->ymax-NODE_DY/2.0f, 'v'); UI_DrawTriIcon(rct->xmin+10.0f, rct->ymax-NODE_DY/2.0f, 'v');
/* this isn't doing anything for the label, so commenting out /* this isn't doing anything for the label, so commenting out
if(node->flag & SELECT) if(node->flag & SELECT)
@@ -878,7 +877,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10); UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
/* open entirely icon */ /* open entirely icon */
ui_draw_tria_icon(rct->xmin+10.0f, centy, 'h'); UI_DrawTriIcon(rct->xmin+10.0f, centy, 'h');
/* disable lines */ /* disable lines */
if(node->flag & NODE_MUTED) if(node->flag & NODE_MUTED)

2
source/blender/editors/space_view3d/drawmesh.c
View File

@@ -340,7 +340,7 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac
/* Icky globals, fix with userdata parameter */ /* Icky globals, fix with userdata parameter */
struct TextureDrawState { static struct TextureDrawState {
Object *ob; Object *ob;
int islit, istex; int islit, istex;
int color_profile; int color_profile;

3
source/blender/editors/space_view3d/drawobject.c
View File

@@ -5558,8 +5558,7 @@ static void draw_hooks(Object *ob)
} }
} }
//<rcruiz> static void drawRBpivot(bRigidBodyJointConstraint *data)
void drawRBpivot(bRigidBodyJointConstraint *data)
{ {
int axis; int axis;
float mat[4][4]; float mat[4][4];

2
source/blender/editors/space_view3d/drawvolume.c
View File

@@ -126,7 +126,7 @@ static double tval()
struct GPUTexture; struct GPUTexture;
int intersect_edges(float *points, float a, float b, float c, float d, float edges[12][2][3]) static int intersect_edges(float *points, float a, float b, float c, float d, float edges[12][2][3])
{ {
int i; int i;
float t; float t;

3
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -43,6 +43,7 @@
#include "BKE_context.h" #include "BKE_context.h"
#include "BKE_screen.h" #include "BKE_screen.h"
#include "ED_space_api.h"
#include "ED_screen.h" #include "ED_screen.h"
#include "ED_object.h" #include "ED_object.h"
@@ -910,7 +911,7 @@ static void view3d_props_area_listener(ARegion *ar, wmNotifier *wmn)
} }
/*area (not region) level listener*/ /*area (not region) level listener*/
void space_view3d_listener(struct ScrArea *sa, struct wmNotifier *wmn) static void space_view3d_listener(struct ScrArea *sa, struct wmNotifier *wmn)
{ {
View3D *v3d = sa->spacedata.first; View3D *v3d = sa->spacedata.first;

8
source/blender/editors/space_view3d/view3d_buttons.c
View File

@@ -709,7 +709,7 @@ static void do_view3d_vgroup_buttons(bContext *C, void *UNUSED(arg), int event)
WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data); WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
} }
int view3d_panel_vgroup_poll(const bContext *C, PanelType *UNUSED(pt)) static int view3d_panel_vgroup_poll(const bContext *C, PanelType *UNUSED(pt))
{ {
Scene *scene= CTX_data_scene(C); Scene *scene= CTX_data_scene(C);
Object *ob= OBACT; Object *ob= OBACT;
@@ -925,7 +925,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob)
} }
/* assumes armature editmode */ /* assumes armature editmode */
void validate_editbonebutton_cb(bContext *C, void *bonev, void *namev) static void validate_editbonebutton_cb(bContext *C, void *bonev, void *namev)
{ {
EditBone *eBone= bonev; EditBone *eBone= bonev;
char oldname[sizeof(eBone->name)], newname[sizeof(eBone->name)]; char oldname[sizeof(eBone->name)], newname[sizeof(eBone->name)];
@@ -1199,12 +1199,12 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, ob); WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, ob);
} }
void removeTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg)) static void removeTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg))
{ {
BIF_removeTransformOrientation(C, (TransformOrientation *) target); BIF_removeTransformOrientation(C, (TransformOrientation *) target);
} }
void selectTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg)) static void selectTransformOrientation_func(bContext *C, void *target, void *UNUSED(arg))
{ {
BIF_selectTransformOrientation(C, (TransformOrientation *) target); BIF_selectTransformOrientation(C, (TransformOrientation *) target);
} }

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -917,7 +917,7 @@ void view3d_calc_camera_border(Scene *scene, ARegion *ar, RegionView3D *rv3d, Vi
} }
} }
void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar) static void view3d_set_1_to_1_viewborder(Scene *scene, ARegion *ar)
{ {
RegionView3D *rv3d= ar->regiondata; RegionView3D *rv3d= ar->regiondata;
float size[2]; float size[2];

4
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -2777,7 +2777,7 @@ int view_autodist_depth_segment(struct ARegion *ar, short mval_sta[2], short mva
// those are still not ok // those are still not ok
float ndof_axis_scale[6] = { static float ndof_axis_scale[6] = {
+0.01, // Tx +0.01, // Tx
+0.01, // Tz +0.01, // Tz
+0.01, // Ty +0.01, // Ty
@@ -2786,7 +2786,7 @@ float ndof_axis_scale[6] = {
+0.0015 // Ry +0.0015 // Ry
}; };
void filterNDOFvalues(float *sbval) static void filterNDOFvalues(float *sbval)
{ {
int i=0; int i=0;
float max = 0.0; float max = 0.0;

14
source/blender/editors/space_view3d/view3d_header.c
View File

@@ -137,7 +137,7 @@ static void handle_view3d_lock(bContext *C)
} }
} }
static int layers_exec(bContext *C, wmOperator *op) static int view3d_layers_exec(bContext *C, wmOperator *op)
{ {
Main *bmain= CTX_data_main(C); Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C); Scene *scene= CTX_data_scene(C);
@@ -210,7 +210,7 @@ static int layers_exec(bContext *C, wmOperator *op)
/* applies shift and alt, lazy coding or ok? :) */ /* applies shift and alt, lazy coding or ok? :) */
/* the local per-keymap-entry keymap will solve it */ /* the local per-keymap-entry keymap will solve it */
static int layers_invoke(bContext *C, wmOperator *op, wmEvent *event) static int view3d_layers_invoke(bContext *C, wmOperator *op, wmEvent *event)
{ {
if(event->ctrl || event->oskey) if(event->ctrl || event->oskey)
return OPERATOR_PASS_THROUGH; return OPERATOR_PASS_THROUGH;
@@ -222,12 +222,12 @@ static int layers_invoke(bContext *C, wmOperator *op, wmEvent *event)
int nr= RNA_int_get(op->ptr, "nr") + 10; int nr= RNA_int_get(op->ptr, "nr") + 10;
RNA_int_set(op->ptr, "nr", nr); RNA_int_set(op->ptr, "nr", nr);
} }
layers_exec(C, op); view3d_layers_exec(C, op);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
int layers_poll(bContext *C) static int view3d_layers_poll(bContext *C)
{ {
return (ED_operator_view3d_active(C) && CTX_wm_view3d(C)->localvd==NULL); return (ED_operator_view3d_active(C) && CTX_wm_view3d(C)->localvd==NULL);
} }
@@ -240,9 +240,9 @@ void VIEW3D_OT_layers(wmOperatorType *ot)
ot->idname= "VIEW3D_OT_layers"; ot->idname= "VIEW3D_OT_layers";
/* api callbacks */ /* api callbacks */
ot->invoke= layers_invoke; ot->invoke= view3d_layers_invoke;
ot->exec= layers_exec; ot->exec= view3d_layers_exec;
ot->poll= layers_poll; ot->poll= view3d_layers_poll;
/* flags */ /* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;

8
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -137,7 +137,7 @@ void view3d_get_transformation(ARegion *ar, RegionView3D *rv3d, Object *ob, bglM
/* local prototypes */ /* local prototypes */
void EM_backbuf_checkAndSelectVerts(EditMesh *em, int select) static void EM_backbuf_checkAndSelectVerts(EditMesh *em, int select)
{ {
EditVert *eve; EditVert *eve;
int index= em_wireoffs; int index= em_wireoffs;
@@ -151,7 +151,7 @@ void EM_backbuf_checkAndSelectVerts(EditMesh *em, int select)
} }
} }
void EM_backbuf_checkAndSelectEdges(EditMesh *em, int select) static void EM_backbuf_checkAndSelectEdges(EditMesh *em, int select)
{ {
EditEdge *eed; EditEdge *eed;
int index= em_solidoffs; int index= em_solidoffs;
@@ -165,7 +165,7 @@ void EM_backbuf_checkAndSelectEdges(EditMesh *em, int select)
} }
} }
void EM_backbuf_checkAndSelectFaces(EditMesh *em, int select) static void EM_backbuf_checkAndSelectFaces(EditMesh *em, int select)
{ {
EditFace *efa; EditFace *efa;
int index= 1; int index= 1;
@@ -179,7 +179,7 @@ void EM_backbuf_checkAndSelectFaces(EditMesh *em, int select)
} }
} }
void EM_backbuf_checkAndSelectTFaces(Mesh *me, int select) static void EM_backbuf_checkAndSelectTFaces(Mesh *me, int select)
{ {
MFace *mface = me->mface; MFace *mface = me->mface;
int a; int a;

4
source/blender/editors/space_view3d/view3d_view.c
View File

@@ -427,7 +427,7 @@ static int view3d_setcameratoview_exec(bContext *C, wmOperator *UNUSED(op))
} }
int view3d_setcameratoview_poll(bContext *C) static int view3d_setcameratoview_poll(bContext *C)
{ {
View3D *v3d = CTX_wm_view3d(C); View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d= CTX_wm_region_view3d(C); RegionView3D *rv3d= CTX_wm_region_view3d(C);
@@ -1734,7 +1734,7 @@ extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *cam_f
#endif // WITH_GAMEENGINE #endif // WITH_GAMEENGINE
int game_engine_poll(bContext *C) static int game_engine_poll(bContext *C)
{ {
/* we need a context and area to launch BGE /* we need a context and area to launch BGE
it's a temporary solution to avoid crash at load time it's a temporary solution to avoid crash at load time

40
source/blender/gpu/intern/gpu_buffers.c
View File

@@ -60,10 +60,10 @@
#define MAX_GPU_ATTRIB_DATA 32 #define MAX_GPU_ATTRIB_DATA 32
/* -1 - undefined, 0 - vertex arrays, 1 - VBOs */ /* -1 - undefined, 0 - vertex arrays, 1 - VBOs */
int useVBOs = -1; static int useVBOs = -1;
GPUBufferPool *globalPool = 0; static GPUBufferPool *globalPool = 0;
int GLStates = 0; static int GLStates = 0;
GPUAttrib attribData[MAX_GPU_ATTRIB_DATA] = { { -1, 0, 0 } }; static GPUAttrib attribData[MAX_GPU_ATTRIB_DATA] = { { -1, 0, 0 } };
GPUBufferPool *GPU_buffer_pool_new() GPUBufferPool *GPU_buffer_pool_new()
{ {
@@ -89,7 +89,7 @@ GPUBufferPool *GPU_buffer_pool_new()
return pool; return pool;
} }
void GPU_buffer_pool_remove( int index, GPUBufferPool *pool ) static void GPU_buffer_pool_remove( int index, GPUBufferPool *pool )
{ {
int i; int i;
@@ -108,7 +108,7 @@ void GPU_buffer_pool_remove( int index, GPUBufferPool *pool )
pool->size--; pool->size--;
} }
void GPU_buffer_pool_delete_last( GPUBufferPool *pool ) static void GPU_buffer_pool_delete_last( GPUBufferPool *pool )
{ {
int last; int last;
@@ -773,7 +773,7 @@ void GPU_free_buffers(void *buffers_v)
} }
} }
GPUBuffer *GPU_buffer_setup( DerivedMesh *dm, GPUDrawObject *object, int size, GLenum target, void *user, void (*copy_f)(DerivedMesh *, float *, int *, int *, void *) ) static GPUBuffer *GPU_buffer_setup( DerivedMesh *dm, GPUDrawObject *object, int size, GLenum target, void *user, void (*copy_f)(DerivedMesh *, float *, int *, int *, void *) )
{ {
GPUBuffer *buffer; GPUBuffer *buffer;
float *varray; float *varray;
@@ -855,7 +855,7 @@ GPUBuffer *GPU_buffer_setup( DerivedMesh *dm, GPUDrawObject *object, int size, G
return buffer; return buffer;
} }
void GPU_buffer_copy_vertex(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user)) static void GPU_buffer_copy_vertex(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user))
{ {
int start; int start;
int i, j, numfaces; int i, j, numfaces;
@@ -897,14 +897,14 @@ void GPU_buffer_copy_vertex(DerivedMesh *dm, float *varray, int *index, int *red
} }
} }
GPUBuffer *GPU_buffer_vertex( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_vertex( DerivedMesh *dm )
{ {
DEBUG_VBO("GPU_buffer_vertex\n"); DEBUG_VBO("GPU_buffer_vertex\n");
return GPU_buffer_setup( dm, dm->drawObject, sizeof(float)*3*(dm->drawObject->nelements+dm->drawObject->nlooseverts), GL_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_vertex); return GPU_buffer_setup( dm, dm->drawObject, sizeof(float)*3*(dm->drawObject->nelements+dm->drawObject->nlooseverts), GL_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_vertex);
} }
void GPU_buffer_copy_normal(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user)) static void GPU_buffer_copy_normal(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user))
{ {
int i, numfaces; int i, numfaces;
int start; int start;
@@ -963,14 +963,14 @@ void GPU_buffer_copy_normal(DerivedMesh *dm, float *varray, int *index, int *red
} }
} }
GPUBuffer *GPU_buffer_normal( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_normal( DerivedMesh *dm )
{ {
DEBUG_VBO("GPU_buffer_normal\n"); DEBUG_VBO("GPU_buffer_normal\n");
return GPU_buffer_setup( dm, dm->drawObject, sizeof(float)*3*dm->drawObject->nelements, GL_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_normal); return GPU_buffer_setup( dm, dm->drawObject, sizeof(float)*3*dm->drawObject->nelements, GL_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_normal);
} }
void GPU_buffer_copy_uv(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user)) static void GPU_buffer_copy_uv(DerivedMesh *dm, float *varray, int *index, int *redir, void *UNUSED(user))
{ {
int start; int start;
int i, numfaces; int i, numfaces;
@@ -1010,7 +1010,7 @@ void GPU_buffer_copy_uv(DerivedMesh *dm, float *varray, int *index, int *redir,
} }
} }
GPUBuffer *GPU_buffer_uv( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_uv( DerivedMesh *dm )
{ {
DEBUG_VBO("GPU_buffer_uv\n"); DEBUG_VBO("GPU_buffer_uv\n");
if( DM_get_face_data_layer(dm, CD_MTFACE) != 0 ) /* was sizeof(float)*2 but caused buffer overrun */ if( DM_get_face_data_layer(dm, CD_MTFACE) != 0 ) /* was sizeof(float)*2 but caused buffer overrun */
@@ -1019,7 +1019,7 @@ GPUBuffer *GPU_buffer_uv( DerivedMesh *dm )
return 0; return 0;
} }
void GPU_buffer_copy_color3( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user ) static void GPU_buffer_copy_color3( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user )
{ {
int i, numfaces; int i, numfaces;
unsigned char *varray = (unsigned char *)varray_; unsigned char *varray = (unsigned char *)varray_;
@@ -1049,7 +1049,7 @@ void GPU_buffer_copy_color3( DerivedMesh *dm, float *varray_, int *index, int *r
} }
} }
void GPU_buffer_copy_color4( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user ) static void GPU_buffer_copy_color4( DerivedMesh *dm, float *varray_, int *index, int *redir, void *user )
{ {
int i, numfaces; int i, numfaces;
unsigned char *varray = (unsigned char *)varray_; unsigned char *varray = (unsigned char *)varray_;
@@ -1079,7 +1079,7 @@ void GPU_buffer_copy_color4( DerivedMesh *dm, float *varray_, int *index, int *r
} }
} }
GPUBuffer *GPU_buffer_color( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_color( DerivedMesh *dm )
{ {
unsigned char *colors; unsigned char *colors;
int i, numfaces; int i, numfaces;
@@ -1112,7 +1112,7 @@ GPUBuffer *GPU_buffer_color( DerivedMesh *dm )
return result; return result;
} }
void GPU_buffer_copy_edge(DerivedMesh *dm, float *varray, int *UNUSED(index), int *UNUSED(redir), void *UNUSED(user)) static void GPU_buffer_copy_edge(DerivedMesh *dm, float *varray, int *UNUSED(index), int *UNUSED(redir), void *UNUSED(user))
{ {
int i; int i;
@@ -1131,14 +1131,14 @@ void GPU_buffer_copy_edge(DerivedMesh *dm, float *varray, int *UNUSED(index), in
} }
} }
GPUBuffer *GPU_buffer_edge( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_edge( DerivedMesh *dm )
{ {
DEBUG_VBO("GPU_buffer_edge\n"); DEBUG_VBO("GPU_buffer_edge\n");
return GPU_buffer_setup( dm, dm->drawObject, sizeof(int)*2*dm->drawObject->nedges, GL_ELEMENT_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_edge); return GPU_buffer_setup( dm, dm->drawObject, sizeof(int)*2*dm->drawObject->nedges, GL_ELEMENT_ARRAY_BUFFER_ARB, 0, GPU_buffer_copy_edge);
} }
void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(index), int *UNUSED(redir), void *UNUSED(user)) static void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(index), int *UNUSED(redir), void *UNUSED(user))
{ {
MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE); MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE);
int i, j=0; int i, j=0;
@@ -1175,7 +1175,7 @@ void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(index),
} }
} }
GPUBuffer *GPU_buffer_uvedge( DerivedMesh *dm ) static GPUBuffer *GPU_buffer_uvedge( DerivedMesh *dm )
{ {
DEBUG_VBO("GPU_buffer_uvedge\n"); DEBUG_VBO("GPU_buffer_uvedge\n");
/* logic here: /* logic here:

24
source/blender/gpu/intern/gpu_codegen.c
View File

@@ -766,7 +766,7 @@ GPUShader *GPU_pass_shader(GPUPass *pass)
return pass->shader; return pass->shader;
} }
void GPU_nodes_extract_dynamic_inputs(GPUPass *pass, ListBase *nodes) static void GPU_nodes_extract_dynamic_inputs(GPUPass *pass, ListBase *nodes)
{ {
GPUShader *shader = pass->shader; GPUShader *shader = pass->shader;
GPUNode *node; GPUNode *node;
@@ -882,7 +882,7 @@ void GPU_pass_unbind(GPUPass *pass)
/* Node Link Functions */ /* Node Link Functions */
GPUNodeLink *GPU_node_link_create(int type) static GPUNodeLink *GPU_node_link_create(int type)
{ {
GPUNodeLink *link = MEM_callocN(sizeof(GPUNodeLink), "GPUNodeLink"); GPUNodeLink *link = MEM_callocN(sizeof(GPUNodeLink), "GPUNodeLink");
link->type = type; link->type = type;
@@ -891,7 +891,7 @@ GPUNodeLink *GPU_node_link_create(int type)
return link; return link;
} }
void GPU_node_link_free(GPUNodeLink *link) static void GPU_node_link_free(GPUNodeLink *link)
{ {
link->users--; link->users--;
@@ -907,7 +907,7 @@ void GPU_node_link_free(GPUNodeLink *link)
/* Node Functions */ /* Node Functions */
GPUNode *GPU_node_begin(const char *name) static GPUNode *GPU_node_begin(const char *name)
{ {
GPUNode *node = MEM_callocN(sizeof(GPUNode), "GPUNode"); GPUNode *node = MEM_callocN(sizeof(GPUNode), "GPUNode");
@@ -916,7 +916,7 @@ GPUNode *GPU_node_begin(const char *name)
return node; return node;
} }
void GPU_node_end(GPUNode *UNUSED(node)) static void GPU_node_end(GPUNode *UNUSED(node))
{ {
/* empty */ /* empty */
} }
@@ -1055,7 +1055,7 @@ static void GPU_node_output(GPUNode *node, int type, const char *UNUSED(name), G
BLI_addtail(&node->outputs, output); BLI_addtail(&node->outputs, output);
} }
void GPU_inputs_free(ListBase *inputs) static void GPU_inputs_free(ListBase *inputs)
{ {
GPUInput *input; GPUInput *input;
@@ -1069,7 +1069,7 @@ void GPU_inputs_free(ListBase *inputs)
BLI_freelistN(inputs); BLI_freelistN(inputs);
} }
void GPU_node_free(GPUNode *node) static void GPU_node_free(GPUNode *node)
{ {
GPUOutput *output; GPUOutput *output;
@@ -1085,7 +1085,7 @@ void GPU_node_free(GPUNode *node)
MEM_freeN(node); MEM_freeN(node);
} }
void GPU_nodes_free(ListBase *nodes) static void GPU_nodes_free(ListBase *nodes)
{ {
GPUNode *node; GPUNode *node;
@@ -1098,7 +1098,7 @@ void GPU_nodes_free(ListBase *nodes)
/* vertex attributes */ /* vertex attributes */
void gpu_nodes_get_vertex_attributes(ListBase *nodes, GPUVertexAttribs *attribs) static void gpu_nodes_get_vertex_attributes(ListBase *nodes, GPUVertexAttribs *attribs)
{ {
GPUNode *node; GPUNode *node;
GPUInput *input; GPUInput *input;
@@ -1134,7 +1134,7 @@ void gpu_nodes_get_vertex_attributes(ListBase *nodes, GPUVertexAttribs *attribs)
} }
} }
void gpu_nodes_get_builtin_flag(ListBase *nodes, int *builtin) static void gpu_nodes_get_builtin_flag(ListBase *nodes, int *builtin)
{ {
GPUNode *node; GPUNode *node;
GPUInput *input; GPUInput *input;
@@ -1352,7 +1352,7 @@ int GPU_link_changed(GPUNodeLink *link)
/* Pass create/free */ /* Pass create/free */
void gpu_nodes_tag(GPUNodeLink *link) static void gpu_nodes_tag(GPUNodeLink *link)
{ {
GPUNode *node; GPUNode *node;
GPUInput *input; GPUInput *input;
@@ -1370,7 +1370,7 @@ void gpu_nodes_tag(GPUNodeLink *link)
gpu_nodes_tag(input->link); gpu_nodes_tag(input->link);
} }
void gpu_nodes_prune(ListBase *nodes, GPUNodeLink *outlink) static void gpu_nodes_prune(ListBase *nodes, GPUNodeLink *outlink)
{ {
GPUNode *node, *next; GPUNode *node, *next;

2
source/blender/gpu/intern/gpu_draw.c
View File

@@ -930,7 +930,7 @@ static void gpu_material_to_fixed(GPUMaterialFixed *smat, const Material *bmat,
} }
} }
Material *gpu_active_node_material(Material *ma) static Material *gpu_active_node_material(Material *ma)
{ {
if(ma && ma->use_nodes && ma->nodetree) { if(ma && ma->use_nodes && ma->nodetree) {
bNode *node= nodeGetActiveID(ma->nodetree, ID_MA); bNode *node= nodeGetActiveID(ma->nodetree, ID_MA);

4
source/blender/gpu/intern/gpu_material.c
View File

@@ -596,7 +596,7 @@ static void do_specular_ramp(GPUShadeInput *shi, GPUNodeLink *is, GPUNodeLink *t
} }
} }
void add_user_list(ListBase *list, void *data) static void add_user_list(ListBase *list, void *data)
{ {
LinkData *link = MEM_callocN(sizeof(LinkData), "GPULinkData"); LinkData *link = MEM_callocN(sizeof(LinkData), "GPULinkData");
link->data = data; link->data = data;
@@ -1348,7 +1348,7 @@ void GPU_shaderesult_set(GPUShadeInput *shi, GPUShadeResult *shr)
GPU_link(mat, "linearrgb_to_srgb", shr->combined, &shr->combined); GPU_link(mat, "linearrgb_to_srgb", shr->combined, &shr->combined);
} }
GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma) static GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma)
{ {
GPUShadeInput shi; GPUShadeInput shi;
GPUShadeResult shr; GPUShadeResult shr;

10
source/blender/imbuf/intern/jp2.c
View File

@@ -69,21 +69,21 @@ int imb_is_a_jp2(unsigned char *buf)
/** /**
sample error callback expecting a FILE* client object sample error callback expecting a FILE* client object
*/ */
void error_callback(const char *msg, void *client_data) { static void error_callback(const char *msg, void *client_data) {
FILE *stream = (FILE*)client_data; FILE *stream = (FILE*)client_data;
fprintf(stream, "[ERROR] %s", msg); fprintf(stream, "[ERROR] %s", msg);
} }
/** /**
sample warning callback expecting a FILE* client object sample warning callback expecting a FILE* client object
*/ */
void warning_callback(const char *msg, void *client_data) { static void warning_callback(const char *msg, void *client_data) {
FILE *stream = (FILE*)client_data; FILE *stream = (FILE*)client_data;
fprintf(stream, "[WARNING] %s", msg); fprintf(stream, "[WARNING] %s", msg);
} }
/** /**
sample debug callback expecting no client object sample debug callback expecting no client object
*/ */
void info_callback(const char *msg, void *client_data) { static void info_callback(const char *msg, void *client_data) {
(void)client_data; (void)client_data;
fprintf(stdout, "[INFO] %s", msg); fprintf(stdout, "[INFO] %s", msg);
} }
@@ -322,7 +322,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){
return 2; return 2;
} }
void cinema_parameters(opj_cparameters_t *parameters){ static void cinema_parameters(opj_cparameters_t *parameters){
parameters->tile_size_on = false; parameters->tile_size_on = false;
parameters->cp_tdx=1; parameters->cp_tdx=1;
parameters->cp_tdy=1; parameters->cp_tdy=1;
@@ -355,7 +355,7 @@ void cinema_parameters(opj_cparameters_t *parameters){
} }
void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
int i; int i;
float temp_rate; float temp_rate;

4
source/blender/imbuf/intern/thumbs.c
View File

@@ -122,7 +122,7 @@ static const char hex[17] = "0123456789abcdef";
/* Note: This escape function works on file: URIs, but if you want to /* Note: This escape function works on file: URIs, but if you want to
* escape something else, please read RFC-2396 */ * escape something else, please read RFC-2396 */
void escape_uri_string (const char *string, char* escaped_string, int len,UnsafeCharacterSet mask) static void escape_uri_string (const char *string, char* escaped_string, int len,UnsafeCharacterSet mask)
{ {
#define ACCEPTABLE(a) ((a)>=32 && (a)<128 && (acceptable[(a)-32] & use_mask)) #define ACCEPTABLE(a) ((a)>=32 && (a)<128 && (acceptable[(a)-32] & use_mask))
@@ -148,7 +148,7 @@ void escape_uri_string (const char *string, char* escaped_string, int len,Unsafe
*q = '\0'; *q = '\0';
} }
void to_hex_char(char* hexbytes, const unsigned char* bytes, int len) static void to_hex_char(char* hexbytes, const unsigned char* bytes, int len)
{ {
const unsigned char *p; const unsigned char *p;
char *q; char *q;

2
source/blender/modifiers/intern/MOD_array.c
View File

@@ -51,6 +51,8 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {
ArrayModifierData *amd = (ArrayModifierData*) md; ArrayModifierData *amd = (ArrayModifierData*) md;

2
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -38,6 +38,8 @@
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BKE_particle.h" #include "BKE_particle.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -41,6 +41,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_boolean_util.h" #include "MOD_boolean_util.h"
#include "MOD_util.h"
static void copyData(ModifierData *md, ModifierData *target) static void copyData(ModifierData *md, ModifierData *target)

4
source/blender/modifiers/intern/MOD_boolean_util.c
View File

@@ -48,6 +48,8 @@
#include "CSG_BooleanOps.h" #include "CSG_BooleanOps.h"
#include "MOD_boolean_util.h"
/** /**
* Here's the vertex iterator structure used to walk through * Here's the vertex iterator structure used to walk through
* the blender vertex structure. * the blender vertex structure.
@@ -451,7 +453,7 @@ static void FreeMeshDescriptors(
FaceIt_Destruct(face_it); FaceIt_Destruct(face_it);
} }
DerivedMesh *NewBooleanDerivedMesh_intern( static DerivedMesh *NewBooleanDerivedMesh_intern(
DerivedMesh *dm, struct Object *ob, DerivedMesh *dm_select, struct Object *ob_select, DerivedMesh *dm, struct Object *ob, DerivedMesh *dm_select, struct Object *ob_select,
int int_op_type, Material **mat, int *totmat) int int_op_type, Material **mat, int *totmat)
{ {

1
source/blender/modifiers/intern/MOD_build.c
View File

@@ -46,6 +46,7 @@
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_cloth.c
View File

@@ -47,6 +47,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_collision.c
View File

@@ -48,6 +48,7 @@
#include "BKE_pointcache.h" #include "BKE_pointcache.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_curve.c
View File

@@ -44,6 +44,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

2
source/blender/modifiers/intern/MOD_decimate.c
View File

@@ -47,6 +47,8 @@
#include "LOD_decimation.h" #include "LOD_decimation.h"
#endif #endif
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {
DecimateModifierData *dmd = (DecimateModifierData*) md; DecimateModifierData *dmd = (DecimateModifierData*) md;

1
source/blender/modifiers/intern/MOD_edgesplit.c
View File

@@ -48,6 +48,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "MOD_util.h"
#if 0 #if 0
#define EDGESPLIT_DEBUG_3 #define EDGESPLIT_DEBUG_3

1
source/blender/modifiers/intern/MOD_explode.c
View File

@@ -51,6 +51,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@@ -42,6 +42,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
#include "MOD_fluidsim_util.h" #include "MOD_fluidsim_util.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

10
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -45,11 +45,13 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_fluidsim.h" /* ensure definitions here match */
#include "BKE_cdderivedmesh.h" #include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
#include "BKE_global.h" /* G.main->name only */ #include "BKE_global.h" /* G.main->name only */
#include "MOD_fluidsim_util.h"
#include "MOD_modifiertypes.h" #include "MOD_modifiertypes.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -167,7 +169,7 @@ void fluidsim_free(FluidsimModifierData *fluidmd)
#ifndef DISABLE_ELBEEM #ifndef DISABLE_ELBEEM
/* read .bobj.gz file into a fluidsimDerivedMesh struct */ /* read .bobj.gz file into a fluidsimDerivedMesh struct */
DerivedMesh *fluidsim_read_obj(char *filename) static DerivedMesh *fluidsim_read_obj(const char *filename)
{ {
int wri = 0,i; int wri = 0,i;
int gotBytes; int gotBytes;
@@ -379,7 +381,7 @@ void fluid_estimate_memory(Object *ob, FluidsimSettings *fss, char *value)
/* read zipped fluidsim velocities into the co's of the fluidsimsettings normals struct */ /* read zipped fluidsim velocities into the co's of the fluidsimsettings normals struct */
void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *dm, char *filename) static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *dm, char *filename)
{ {
int wri, i, j; int wri, i, j;
float wrf; float wrf;
@@ -442,7 +444,7 @@ void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *dm, cha
gzclose(gzf); gzclose(gzf);
} }
DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData *fluidmd, int framenr, int useRenderParams) static DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData *fluidmd, int framenr, int useRenderParams)
{ {
int displaymode = 0; int displaymode = 0;
int curFrame = framenr - 1 /*scene->r.sfra*/; /* start with 0 at start frame */ int curFrame = framenr - 1 /*scene->r.sfra*/; /* start with 0 at start frame */
@@ -537,7 +539,7 @@ DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData *fluid
DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene,
Object *UNUSED(ob), Object *UNUSED(ob),
DerivedMesh *dm, DerivedMesh *dm,
int useRenderParams) int useRenderParams, int UNUSED(isFinalCalc))
{ {
#ifndef DISABLE_ELBEEM #ifndef DISABLE_ELBEEM
DerivedMesh *result = NULL; DerivedMesh *result = NULL;

2
source/blender/modifiers/intern/MOD_fluidsim_util.h
View File

@@ -42,6 +42,6 @@ void fluidsim_free(struct FluidsimModifierData *fluidmd);
struct DerivedMesh *fluidsimModifier_do(struct FluidsimModifierData *fluidmd, struct DerivedMesh *fluidsimModifier_do(struct FluidsimModifierData *fluidmd,
struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm,
int useRenderParams, int isFinalCalc); int useRenderParams, int isFinalCalc);
#endif #endif

1
source/blender/modifiers/intern/MOD_hook.c
View File

@@ -46,6 +46,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {

1
source/blender/modifiers/intern/MOD_mask.c
View File

@@ -47,6 +47,7 @@
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
static void copyData(ModifierData *md, ModifierData *target) static void copyData(ModifierData *md, ModifierData *target)
{ {

2
source/blender/modifiers/intern/MOD_mirror.c
View File

@@ -45,6 +45,8 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {
MirrorModifierData *mmd = (MirrorModifierData*) md; MirrorModifierData *mmd = (MirrorModifierData*) md;

2
source/blender/modifiers/intern/MOD_multires.c
View File

@@ -40,6 +40,8 @@
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "MOD_util.h"
static void initData(ModifierData *md) static void initData(ModifierData *md)
{ {
MultiresModifierData *mmd = (MultiresModifierData*)md; MultiresModifierData *mmd = (MultiresModifierData*)md;

1
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -45,6 +45,7 @@
#include "BKE_particle.h" #include "BKE_particle.h"
#include "BKE_pointcache.h" #include "BKE_pointcache.h"
#include "MOD_util.h"
#include "depsgraph_private.h" #include "depsgraph_private.h"

2
source/blender/modifiers/intern/MOD_simpledeform.c
View File

@@ -148,7 +148,7 @@ static void simpleDeform_bend(const float factor, const float dcut[3], float *co
/* simple deform modifier */ /* simple deform modifier */
void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts) static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
{ {
static const float lock_axis[2] = {0.0f, 0.0f}; static const float lock_axis[2] = {0.0f, 0.0f};

3
source/blender/modifiers/intern/MOD_util.h
View File

@@ -28,6 +28,9 @@
#ifndef MOD_UTIL_H #ifndef MOD_UTIL_H
#define MOD_UTIL_H #define MOD_UTIL_H
/* so modifier types match their defines */
#include "MOD_modifiertypes.h"
struct Tex; struct Tex;
struct TexResult; struct TexResult;
struct CustomData; struct CustomData;

6
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -645,7 +645,7 @@ static void wm_region_mouse_co(bContext *C, wmEvent *event)
} }
} }
int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, PointerRNA *properties, ReportList *reports, short poll_only) static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, PointerRNA *properties, ReportList *reports, short poll_only)
{ {
wmWindowManager *wm= CTX_wm_manager(C); wmWindowManager *wm= CTX_wm_manager(C);
int retval= OPERATOR_PASS_THROUGH; int retval= OPERATOR_PASS_THROUGH;
@@ -1934,7 +1934,7 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
} }
/* lets not expose struct outside wm? */ /* lets not expose struct outside wm? */
void WM_event_set_handler_flag(wmEventHandler *handler, int flag) static void WM_event_set_handler_flag(wmEventHandler *handler, int flag)
{ {
handler->flag= flag; handler->flag= flag;
} }
@@ -2083,7 +2083,7 @@ void WM_event_remove_area_handler(ListBase *handlers, void *area)
} }
} }
void WM_event_remove_handler(ListBase *handlers, wmEventHandler *handler) static void WM_event_remove_handler(ListBase *handlers, wmEventHandler *handler)
{ {
BLI_remlink(handlers, handler); BLI_remlink(handlers, handler);
wm_event_free_handler(handler); wm_event_free_handler(handler);

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

@@ -83,6 +83,7 @@
#include "RNA_access.h" #include "RNA_access.h"
#include "RNA_define.h" #include "RNA_define.h"
#include "RNA_enum_types.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "UI_resources.h" #include "UI_resources.h"
@@ -219,7 +220,7 @@ static int wm_macro_exec(bContext *C, wmOperator *op)
return wm_macro_end(op, retval); return wm_macro_end(op, retval);
} }
int wm_macro_invoke_internal(bContext *C, wmOperator *op, wmEvent *event, wmOperator *opm) static int wm_macro_invoke_internal(bContext *C, wmOperator *op, wmEvent *event, wmOperator *opm)
{ {
int retval= OPERATOR_FINISHED; int retval= OPERATOR_FINISHED;
@@ -914,7 +915,7 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2)
uiPupBlockClose(C, block); uiPupBlockClose(C, block);
} }
void dialog_check_cb(bContext *C, void *op_ptr, void *UNUSED(arg)) static void dialog_check_cb(bContext *C, void *op_ptr, void *UNUSED(arg))
{ {
wmOperator *op= op_ptr; wmOperator *op= op_ptr;
if(op->type->check) { if(op->type->check) {
@@ -1076,7 +1077,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
/* XXX: hack to refresh splash screen with updated prest menu name, /* XXX: hack to refresh splash screen with updated prest menu name,
* since popup blocks don't get regenerated like panels do */ * since popup blocks don't get regenerated like panels do */
void wm_block_splash_refreshmenu (bContext *UNUSED(C), void *UNUSED(arg_block), void *UNUSED(arg)) static void wm_block_splash_refreshmenu (bContext *UNUSED(C), void *UNUSED(arg_block), void *UNUSED(arg))
{ {
/* ugh, causes crashes in other buttons, disabling for now until /* ugh, causes crashes in other buttons, disabling for now until
* a better fix * a better fix
@@ -2620,7 +2621,7 @@ void WM_OT_straightline_gesture(wmOperatorType *ot)
/* *********************** radial control ****************** */ /* *********************** radial control ****************** */
const int WM_RADIAL_CONTROL_DISPLAY_SIZE = 200; static const int WM_RADIAL_CONTROL_DISPLAY_SIZE = 200;
typedef struct wmRadialControl { typedef struct wmRadialControl {
int mode; int mode;

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

@@ -69,7 +69,7 @@
#include "GPU_extensions.h" #include "GPU_extensions.h"
/* the global to talk to ghost */ /* the global to talk to ghost */
GHOST_SystemHandle g_system= NULL; static GHOST_SystemHandle g_system= NULL;
/* set by commandline */ /* set by commandline */
static int prefsizx= 0, prefsizy= 0, prefstax= 0, prefstay= 0, initialstate= GHOST_kWindowStateNormal; static int prefsizx= 0, prefsizy= 0, prefstax= 0, prefstay= 0, initialstate= GHOST_kWindowStateNormal;