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>2014-01-07 10:04:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-07 10:12:24 +0400
commit4a372102c708ee5a53af5b70a4efec30f2d87b6f (patch)
treeeaade6762caf6c44172f8f871ef114c54385474b /source/blender/makesdna/DNA_curve_types.h
parenta97180046b447016c683aaececd45f28c8550d03 (diff)
Text3d: move text selection boxes from Curve to EditFont struct
resolves T38079
Diffstat (limited to 'source/blender/makesdna/DNA_curve_types.h')
-rw-r--r--source/blender/makesdna/DNA_curve_types.h27
1 files changed, 14 insertions, 13 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index adcc4af41e0..f30ecad4cd9 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -210,7 +210,8 @@ typedef struct Curve {
int actnu;
/* edit, last selected point */
void *lastsel;
-
+
+
/* font part */
short lines;
char spacemode, pad1;
@@ -218,35 +219,35 @@ typedef struct Curve {
float xof, yof;
float linewidth;
- int pad3;
- int len_wchar; /* number of characters (strinfo) */
- int len; /* number of bytes (str - utf8) */
- char *str;
- struct SelBox *selboxes; /* runtime variable for drawing selections (editmode data) */
- struct EditFont *editfont;
-
/* copy of EditFont vars (wchar_t aligned),
* warning! don't use in editmode (storage only) */
int pos;
int selstart, selend;
- int pad2;
+
+ /* text data */
+ int len_wchar; /* number of characters (strinfo) */
+ int len; /* number of bytes (str - utf8) */
+ char *str;
+ struct EditFont *editfont;
char family[64];
struct VFont *vfont;
struct VFont *vfontb;
struct VFont *vfonti;
struct VFont *vfontbi;
-
- int pad4;
- float ctime; /* current evaltime - for use by Objects parented to curves */
- int totbox, actbox;
struct TextBox *tb;
+ int totbox, actbox;
struct CharInfo *strinfo;
struct CharInfo curinfo;
+ /* font part end */
+
+ float ctime; /* current evaltime - for use by Objects parented to curves */
float bevfac1, bevfac2;
+
+ char pad[4];
} Curve;
/* **************** CURVE ********************* */