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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-19 16:22:30 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-19 16:22:30 +0300
commit733fd3eabd840a1bc60f5ec8960330dca3cbc347 (patch)
tree078f1c75f3b50d5515713f18c4eeba53bdfd3fce /source/blender/makesdna
parent8a2f0058aeab48e837561719a5dda27985d99ee5 (diff)
Workbench: removed per collection object color
Will be part of the collection manager where per collection the ob->col can be set. This currently depends on DepsGraph + CollectionManager. I removed it for now so the code won't influence development
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 18b5ab70196..8953518778a 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -80,11 +80,6 @@ enum {
V3D_LIGHTING_SCENE = 2
};
-enum {
- V3D_OBJECT_COLOR_COLLECTION = 0,
- V3D_OBJECT_COLOR_OBJECT = 1,
-};
-
typedef struct RegionView3D {
float winmat[4][4]; /* GL_PROJECTION matrix */
@@ -252,9 +247,7 @@ typedef struct View3D {
short drawtype_solid;
/* drawtype subtype (lighting) used when drawtype == OB_TEXTURE */
short drawtype_texture;
- /* how to draw objects when drawtype == OB_SOLID */
- short drawtype_object_color;
- char pad5[6];
+
View3DDebug debug;
} View3D;