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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-04 16:08:57 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-04 17:11:27 +0300
commitfc115e1ab23a9c458ea1496f160e14009e68cd54 (patch)
treef61d7a4d8c09d5ebf6839299ec00998976f31f3f /source/blender/makesdna
parent0f50caf5560f9c2f9af393eefdf2b209210dbfba (diff)
Cleanup: remove legacy layer and dupli code.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_layer_types.h2
-rw-r--r--source/blender/makesdna/DNA_object_types.h2
-rw-r--r--source/blender/makesdna/DNA_scene_types.h4
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h8
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index e6b1bda7cf5..3dcd31fbd7b 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -40,7 +40,7 @@ typedef struct Base {
short pad;
short sx, sy;
struct Object *object;
- unsigned int lay;
+ unsigned int lay DNA_DEPRECATED;
int flag_legacy;
} Base;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 1f6f7cd9bf2..a000a083ff6 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -216,7 +216,7 @@ typedef struct Object {
*/
float imat_ren[4][4];
- unsigned int lay; /* copy of Base's layer in the scene */
+ unsigned int lay DNA_DEPRECATED; /* copy of Base's layer in the scene */
short flag; /* copy of Base */
short colbits DNA_DEPRECATED; /* deprecated, use 'matbits' */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 63a6a191b9e..eb1a17a044c 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1488,8 +1488,8 @@ typedef struct Scene {
View3DCursor cursor; /* 3d cursor location */
- unsigned int lay; /* bitflags for layer visibility */
- int layact; /* active layer */
+ unsigned int lay DNA_DEPRECATED; /* bitflags for layer visibility */
+ int layact DNA_DEPRECATED; /* active layer */
unsigned int pad1;
short flag; /* various settings */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 65b6192b9c8..bf5a5cf846f 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -216,8 +216,8 @@ typedef struct View3D {
char bundle_drawtype; /* display style for bundle */
char pad[3];
- unsigned int lay_prev; /* for active layer toggle */
- unsigned int lay_used; /* used while drawing */
+ unsigned int lay_prev DNA_DEPRECATED; /* for active layer toggle */
+ unsigned int lay_used DNA_DEPRECATED; /* used while drawing */
int object_type_exclude_viewport;
int object_type_exclude_select;
@@ -232,8 +232,8 @@ typedef struct View3D {
char ob_centre_bone[64]; /* optional string for armature bone to define center, MAXBONENAME */
- unsigned int lay;
- int layact;
+ unsigned int lay DNA_DEPRECATED;
+ int layact DNA_DEPRECATED;
short ob_centre_cursor; /* optional bool for 3d cursor to define center */
short scenelock;