diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
commit | 94ae0232b0337ab70cecaef03cd845887cd36eaa (patch) | |
tree | caea2819c7fe0400fb91c9bdf0e99a9e0fd50cf6 /source/blender/makesdna | |
parent | 9a109c22ae1ef8a5c75932d661610b23ec685bd7 (diff) | |
parent | f68e9db583489d541d535791536ea20bc1ae1d76 (diff) |
Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 12 |
4 files changed, 26 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 03b23c5137a..da666059601 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -119,7 +119,10 @@ typedef struct Mesh { short texflag, drawflag; short smoothresh, flag; - short subdiv DNA_DEPRECATED, subdivr DNA_DEPRECATED; + /* customdata flag, for bevel-weight and crease, which are now optional */ + char cd_flag, pad; + + char subdiv DNA_DEPRECATED, subdivr DNA_DEPRECATED; char subsurftype DNA_DEPRECATED; /* only kept for backwards compat, not used anymore */ char editflag; @@ -172,6 +175,11 @@ typedef struct TFace { #define ME_DS_EXPAND 512 #define ME_SCULPT_DYNAMIC_TOPOLOGY 1024 +/* me->cd_flag */ +#define ME_CDFLAG_VERT_BWEIGHT (1 << 0) +#define ME_CDFLAG_EDGE_BWEIGHT (1 << 1) +#define ME_CDFLAG_EDGE_CREASE (1 << 2) + /* me->drawflag, short */ #define ME_DRAWEDGES (1 << 0) #define ME_DRAWFACES (1 << 1) diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index af1981ae07d..b85bdecee02 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -167,7 +167,7 @@ typedef struct MIntProperty { int i; } MIntProperty; typedef struct MStringProperty { - char s[256]; + char s[255], s_len; } MStringProperty; typedef struct OrigSpaceFace { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 89328c33674..559ba446740 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -178,7 +178,7 @@ typedef struct Object { short ipoflag; // xxx deprecated... old animation system short scaflag; /* ui state for game logic */ char scavisflag; /* more display settings for game logic */ - char pad5; + char depsflag; int dupon, dupoff, dupsta, dupend; @@ -530,6 +530,10 @@ typedef struct DupliObject { #define OB_BODY_TYPE_NAVMESH 7 #define OB_BODY_TYPE_CHARACTER 8 +/* ob->depsflag */ +#define OB_DEPS_EXTRA_OB_RECALC 1 +#define OB_DEPS_EXTRA_DATA_RECALC 2 + /* ob->scavisflag */ #define OB_VIS_SENS 1 #define OB_VIS_CONT 2 diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e7f27834c85..96bf4a10dda 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -149,6 +149,13 @@ typedef struct uiPanelColors { int pad; } uiPanelColors; +typedef struct uiGradientColors { + char gradient[4]; + char high_gradient[4]; + int show_grad; + int pad2; +} uiGradientColors; + typedef struct ThemeUI { /* Interface Elements (buttons, menus, icons) */ uiWidgetColors wcol_regular, wcol_tool, wcol_text; @@ -210,7 +217,9 @@ typedef struct ThemeSpace { /* note, cannot use name 'panel' because of DNA mapping old files */ uiPanelColors panelcolors; - + + uiGradientColors gradients; + char shade1[4]; char shade2[4]; @@ -440,6 +449,7 @@ typedef struct UserDef { int ndof_flag; /* flags for 3D mouse */ short ogl_multisamples; /* amount of samples for OpenGL FSA, if zero no FSA */ + short pad4; float glalphaclip; |