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

merge trunk 16118 -> 116886

Browse Source
This commit is contained in:
Martin Poirier
2008-10-02 20:39:57 +00:00
parent 39e66e4d6f 06c43148a1
commit c35a2d6ea9
1066 changed files with 112489 additions and 41598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/include/butspace.h
View File

@@ -281,9 +281,6 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
#define B_SOFTBODY_BAKE 1422
#define B_SOFTBODY_BAKE_FREE 1423
/* this has MAX_EFFECT settings! Next free define is 1450... */
#define B_SELEFFECT 1430
/* Fluidsim button defines */
#define B_FLUIDSIM_BAKE 1450
#define B_FLUIDSIM_SELDIR 1451