svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-01-15 13:00:29 +00:00
parent 43cd8a9f71 28667a314e
commit 2d06f79ff9
82 changed files with 1929 additions and 470 deletions
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -170,6 +170,8 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_ARMATUREPANEL3 	1013
 #define B_OBJECTPANELSCALE 	1014
 #define B_OBJECTPANELDIMS 	1015
+#define B_TRANSFORMSPACEADD	1016
+#define B_TRANSFORMSPACECLEAR	1017

 /* *********************** */
 #define B_LAMPBUTS		1200