Merge branch 'blender2.8' into soc-2018-bevel

This commit is contained in:
2018-05-29 11:10:54 +05:30
319 changed files with 7462 additions and 2282 deletions

View File

@@ -557,6 +557,8 @@ typedef struct TransInfo {
#define T_TEXTURE (1 << 3)
/* transforming the camera while in camera view */
#define T_CAMERA (1 << 4)
/* transforming the 3D cursor. */
#define T_CURSOR (1 << 5)
// trans on points, having no rotation/scale
#define T_POINTS (1 << 6)
/**
@@ -601,7 +603,9 @@ typedef struct TransInfo {
/** #TransInfo.center has been set, don't change it. */
#define T_OVERRIDE_CENTER (1 << 25)
#define T_CLNOR_REBUILD (1 << 26)
#define T_MODAL_CURSOR_SET (1 << 26)
#define T_CLNOR_REBUILD (1 << 27)
/* TransInfo->modifiers */
#define MOD_CONSTRAINT_SELECT 0x01