Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-04-06 14:55:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-04-06 15:10:09 +0300
commitd8f931c9b7db09f969a0a6379782103071e0e9f5 (patch)
tree730b1eeb0849ab39e722357630e01c7b07483102 /source/blender/makesdna/DNA_userdef_types.h
parent0feca278a48c494ca53dbd5f59985f9540a65401 (diff)
Changes from custom-manipulators branch
Minor changes from custom-manipulators branch, before larger changes are applied.
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 82a56af9386..256d53eed0b 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -495,7 +495,8 @@ typedef struct UserDef {
short tb_leftmouse, tb_rightmouse;
struct SolidLight light[3];
short tw_hotspot, tw_flag, tw_handlesize, tw_size;
- short manipulator_scale, pad3[3];
+ short manipulator_flag, manipulator_scale;
+ int pad3;
short textimeout, texcollectrate;
short wmdrawmethod; /* removed wmpad */
short dragthreshold;