merge from trunk - r17500 to HEAD

This commit is contained in:
2008-12-10 09:45:48 +00:00
70 changed files with 1847 additions and 450 deletions

View File

@@ -103,6 +103,13 @@ extern void do_cambuts(unsigned short event);
extern void do_armbuts(unsigned short event);
extern void do_uvcalculationbuts(unsigned short event);
extern void weight_paint_buttons(struct uiBlock *);
extern void brush_buttons(struct uiBlock *block, short sima,
int evt_nop, int evt_change,
int evt_browse, int evt_local,
int evt_del, int evt_keepdata,
int evt_texbrowse, int evt_texdel);
extern void particle_edit_buttons(struct uiBlock *);
extern char *get_vertexgroup_menustr(struct Object *ob); // used in object buttons