diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-06 14:55:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-06 15:10:09 +0300 |
commit | d8f931c9b7db09f969a0a6379782103071e0e9f5 (patch) | |
tree | 730b1eeb0849ab39e722357630e01c7b07483102 /source/blender/makesdna | |
parent | 0feca278a48c494ca53dbd5f59985f9540a65401 (diff) |
Changes from custom-manipulators branch
Minor changes from custom-manipulators branch,
before larger changes are applied.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_manipulator_types.h | 43 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
4 files changed, 50 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_manipulator_types.h b/source/blender/makesdna/DNA_manipulator_types.h new file mode 100644 index 00000000000..7b75806f7c0 --- /dev/null +++ b/source/blender/makesdna/DNA_manipulator_types.h @@ -0,0 +1,43 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file DNA_manipulator_types.h + * \ingroup DNA + */ + +#ifndef __DNA_MANIPULATOR_TYPES_H__ +#define __DNA_MANIPULATOR_TYPES_H__ + +typedef struct wmManipulatorGroup { + struct wmManipulatorGroup *next, *prev; + + struct wmManipulatorGroupType *type; + ListBase manipulators; + + void *py_instance; /* python stores the class instance here */ + struct ReportList *reports; /* errors and warnings storage */ + + void *customdata; + void (*customdata_free)(void *); /* for freeing customdata from above */ + int flag; /* private */ + int pad; +} wmManipulatorGroup; + +#endif /* __DNA_MANIPULATOR_TYPES_H__ */ 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; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index f84a6c3efc8..0be86108dfc 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -137,7 +137,7 @@ typedef struct RegionView3D { char pad[3]; float ofs_lock[2]; /* normalized offset for locked view: (-1, -1) bottom left, (1, 1) upper right */ - short twdrawflag; + short twdrawflag; /* XXX can easily get rid of this (Julian) */ short rflag; @@ -392,8 +392,8 @@ enum { /* View3d->twflag */ /* USE = user setting, DRAW = based on selection */ #define V3D_USE_MANIPULATOR 1 -#define V3D_DRAW_MANIPULATOR 2 -/* #define V3D_CALC_MANIPULATOR 4 */ /*UNUSED*/ +#define V3D_DRAW_MANIPULATOR (1 << 1) +#define V3D_SHADED_MANIPULATORS (1 << 2) /* BGPic->flag */ /* may want to use 1 for select ? */ diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index b6cf3d555fa..e761d68ca64 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -77,6 +77,7 @@ static const char *includefiles[] = { "DNA_image_types.h", "DNA_texture_types.h", "DNA_lamp_types.h", + "DNA_manipulator_types.h", "DNA_material_types.h", "DNA_vfont_types.h", "DNA_meta_types.h", @@ -1290,6 +1291,7 @@ int main(int argc, char **argv) #include "DNA_image_types.h" #include "DNA_texture_types.h" #include "DNA_lamp_types.h" +#include "DNA_manipulator_types.h" #include "DNA_material_types.h" #include "DNA_vfont_types.h" #include "DNA_meta_types.h" |