Commit: d2c70573a15516e37febd224ce151842751ff1dc Author: Antony Riakiotakis Date: Wed Mar 12 19:14:47 2014 +0200 https://developer.blender.org/rBd2c70573a15516e37febd224ce151842751ff1dc
Merge branch 'master' into soc-2013-paint =================================================================== =================================================================== diff --cc source/blender/editors/include/UI_interface.h index b776ca1,2177b06..28522a6 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@@ -288,9 -283,8 +286,10 @@@ typedef enum #define UI_GRAD_V 5 #define UI_GRAD_V_ALT 9 + #define UI_GRAD_L_ALT 10 +#define UI_COLOR_PALETTE 20 + /* Drawing * * Functions to draw various shapes, taking theme settings into account. _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
