Commit: 46ee9946084ff49620518109b27302ca767d592f
Author: Brecht Van Lommel
Date: Sat May 5 10:03:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB46ee9946084ff49620518109b27302ca767d592f
Cleanup: minor code formatting tweaks for 3D view DNA.
===================================================================
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_view3d_types.h
b/source/blender/makesdna/DNA_view3d_types.h
index f2b7d85810d..ea3795c9ec3 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -73,32 +73,6 @@ typedef struct View3DDebug {
char pad[7];
} View3DDebug;
-/* ********************************* */
-enum {
- V3D_LIGHTING_FLAT = 0,
- V3D_LIGHTING_STUDIO = 1,
- V3D_LIGHTING_SCENE = 2
-};
-
-/*
- * V3D_DRAWOPTION_OBJECT_COLOR, V3D_DRAWOPTION_OBJECT_OVERLAP,
- * V3D_DRAWOPTION_SINGLE_COLOR, V3D_DRAWOPTION_MATERIAL_COLOR are mutual
exclusive
-*/
-enum {
- V3D_DRAWOPTION_MATERIAL_COLOR = (0 << 0),
- V3D_DRAWOPTION_RANDOMIZE = (1 << 0),
- V3D_DRAWOPTION_OBJECT_OVERLAP = (1 << 1),
- V3D_DRAWOPTION_SINGLE_COLOR = (1 << 2),
- V3D_DRAWOPTION_OBJECT_COLOR = (1 << 4),
- V3D_DRAWOPTION_SHADOW = (1 << 5),
-};
-#define V3D_DRAWOPTION_SOLID_COLOR_MASK (V3D_DRAWOPTION_SINGLE_COLOR |
V3D_DRAWOPTION_RANDOMIZE | V3D_DRAWOPTION_OBJECT_COLOR |
V3D_DRAWOPTION_MATERIAL_COLOR)
-
-enum {
- V3D_OVERLAY_FACE_ORIENTATION = (1 << 0),
- V3D_OVERLAY_HIDE_CURSOR = (1 << 1),
-};
-
typedef struct RegionView3D {
float winmat[4][4]; /* GL_PROJECTION matrix */
@@ -343,6 +317,35 @@ typedef struct View3D {
/* View3d->flag3 (short) */
#define V3D_SHOW_WORLD (1 << 0)
+/* View3D->drawtype_lighting */
+enum {
+ V3D_LIGHTING_FLAT = 0,
+ V3D_LIGHTING_STUDIO = 1,
+ V3D_LIGHTING_SCENE = 2
+};
+
+/* View3D->drawtype_options */
+enum {
+ V3D_DRAWOPTION_MATERIAL_COLOR = (0 << 0),
+ V3D_DRAWOPTION_RANDOMIZE = (1 << 0),
+ V3D_DRAWOPTION_OBJECT_OVERLAP = (1 << 1),
+ V3D_DRAWOPTION_SINGLE_COLOR = (1 << 2),
+ V3D_DRAWOPTION_OBJECT_COLOR = (1 << 4),
+ V3D_DRAWOPTION_SHADOW = (1 << 5),
+
+ /* These options are mutually exclusive. */
+ V3D_DRAWOPTION_SOLID_COLOR_MASK = (V3D_DRAWOPTION_SINGLE_COLOR |
+ V3D_DRAWOPTION_RANDOMIZE |
+ V3D_DRAWOPTION_OBJECT_COLOR |
+ V3D_DRAWOPTION_MATERIAL_COLOR),
+};
+
+/* View3D->overlays */
+enum {
+ V3D_OVERLAY_FACE_ORIENTATION = (1 << 0),
+ V3D_OVERLAY_HIDE_CURSOR = (1 << 1),
+};
+
/* View3d->debug.background */
enum {
V3D_DEBUG_BACKGROUND_NONE = (1 << 0),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
