[Bf-blender-cvs] [8ce5bdffca2] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 8ce5bdffca2a8b86458c460f94cc95fdc9e05ab6
Author: Antonio Vazquez
Date:   Tue Jul 17 20:27:37 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8ce5bdffca2a8b86458c460f94cc95fdc9e05ab6

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 870b28d1b5c,1b21ac8fcdf..82d99a38d99
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -567,35 -568,8 +567,35 @@@ class SCENE_PT_simplify_render(SceneBut
          col.prop(rd, "simplify_child_particles_render", text="Max Child Particles")
  
  
 +class SCENE_PT_simplify_greasepencil(SceneButtonsPanel, Panel):
 +    bl_label = "Simplify Grease Pencil"
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    def draw_header(self, context):
 +        rd = context.scene.render
 +        self.layout.prop(rd, "simplify_gpencil", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        rd = context.scene.render
 +
 +        layout.active = rd.simplify_gpencil
 +
 +        row = layout.row()
 +        row.prop(rd, "simplify_gpencil_onplay", text="Only on Play")
 +
 +        split = layout.split()
 +
 +        col = split.column()
 +        col.prop(rd, "simplify_gpencil_view_fill", text="Fill")
 +        col.prop(rd, "simplify_gpencil_remove_lines", text="Remove Fill Lines")
 +        col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers")
 +
 +
  class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
-     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
+     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
      _context_path = "scene"
      _property_type = bpy.types.Scene
  
diff --cc source/blender/blenloader/intern/versioning_280.c
index e44afaf7336,d1ed166ba89..6c3e680b70d
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -1687,20 -1599,27 +1687,42 @@@ void blo_do_versions_280(FileData *fd, 
  			}
  		}
  
+ 		if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "short", "type")) {
+ 			for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+ 				for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+ 					for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						if (sl->spacetype == SPACE_VIEW3D) {
+ 							View3D *v3d = (View3D *)sl;
+ 							if (v3d->drawtype == OB_RENDER) {
+ 								v3d->drawtype = OB_SOLID;
+ 							}
+ 							v3d->shading.type = v3d->drawtype;
+ 							v3d->shading.prev_type = OB_SOLID;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SceneDisplay", "View3DShading", "shading")) {
+ 			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+ 				BKE_screen_view3d_shading_init(&scene->display.shading);
+ 			}
+ 		}
 +		/* initialize grease pencil view data */
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceView3D", "float", "vertex_opacity")) {
 +			for (bScreen *sc = bmain->screen.first; sc; sc = sc->id.next) {
 +				for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
 +					for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_VIEW3D) {
 +							View3D *v3d = (View3D *)sl;
 +							v3d->vertex_opacity = 1.0f;
 +							v3d->flag3 |= V3D_GP_SHOW_EDIT_LINES;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
  	}
  }