Commit: 6c68bea576447a23aa04835848f5424f692d456c
Author: Antonioya
Date: Fri Jul 27 16:39:36 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6c68bea576447a23aa04835848f5424f692d456c
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/makesdna/DNA_view3d_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 1daa245617a,bbbaf8bb957..5d52b3f1de1
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -350,13 -353,9 +356,13 @@@ typedef struct View3D
#define V3D_OCCLUDE_WIRE (1 << 14)
#define V3D_SHOW_MODE_SHADE_OVERRIDE (1 << 15) /* XXX: DNA deprecated */
-
/* View3d->flag3 (short) */
- #define V3D_SHOW_WORLD (1 << 0)
-#define V3D_SHOW_WORLD (1 << 0) /* LEGACY replaced by
V3D_SHADING_BACKGROUND_WORLD */
++#define V3D_SHOW_WORLD (1 << 0) /* LEGACY replaced by
V3D_SHADING_BACKGROUND_WORLD */
+#define V3D_GP_SHOW_PAPER (1 << 2) /* Activate paper to cover all
viewport */
+#define V3D_GP_SHOW_GRID (1 << 3) /* Activate paper grid */
+#define V3D_GP_SHOW_EDIT_LINES (1 << 4)
+#define V3D_GP_SHOW_MULTIEDIT_LINES (1 << 5)
+#define V3D_GP_SHOW_ONION_SKIN (1 << 6) /* main switch at view level */
/* View3DShading->light */
enum {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
