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

[Antonio Vazquez]

Commit: 5feb8317d8f389dcf8fd4971c57b6fdf65439147
Author: Antonio Vazquez
Date:   Wed May 9 14:07:57 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5feb8317d8f389dcf8fd4971c57b6fdf65439147

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_scene.py

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 7421d479fe1,cf17adfe5c1..f1f0af94d0f
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -432,35 -429,20 +432,49 @@@ class SCENE_PT_simplify(SceneButtonsPan
          col.prop(rd, "simplify_child_particles_render", text="Child Particles")
  
  
 +class SCENE_PT_gp_simplify(SceneButtonsPanel, Panel):
 +    bl_label = "Simplify Grease Pencil"
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
 +
 +    def draw_header(self, context):
 +        ts = context.tool_settings
 +        self.layout.prop(ts, "gpencil_simplify", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        ts = context.tool_settings
 +
 +        layout.active = ts.gpencil_simplify
 +
 +        row = layout.row()
 +        row.prop(ts, "gpencil_simplify_onplay", text="Only on Play")
 +
 +        split = layout.split()
 +
 +        col = split.column()
 +        col.prop(ts, "gpencil_simplify_view_fill", text="Fill")
 +        col.prop(ts, "gpencil_simplify_remove_lines", text="Remove Fill Lines")
 +        col.prop(ts, "gpencil_simplify_view_modifier", text="Modifiers")
 +
 +        row = layout.row()
 +        row.prop(ts, "gpencil_disable_fast_drawing")
 +
 +
+ class SCENE_PT_viewport_display(SceneButtonsPanel, Panel):
+     bl_label = "Viewport Display"
+     bl_options = {'DEFAULT_CLOSED'}
+ 
+     @classmethod
+     def poll(cls, context):
+         return True
+ 
+     def draw(self, context):
+         layout = self.layout
+         scene = context.scene
+         layout.prop(scene.display, "light_direction", text="")
+ 
+ 
  class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
      COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
      _context_path = "scene"
diff --cc source/blender/draw/CMakeLists.txt
index 60745380cad,2207dfe5c34..14c3c85d0cf
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -282,23 -277,9 +282,25 @@@ data_to_c_simple(modes/shaders/paint_ve
  data_to_c_simple(modes/shaders/paint_wire_frag.glsl SRC)
  data_to_c_simple(modes/shaders/paint_wire_vert.glsl SRC)
  data_to_c_simple(modes/shaders/paint_vert_frag.glsl SRC)
+ data_to_c_simple(modes/shaders/particle_strand_frag.glsl SRC)
+ data_to_c_simple(modes/shaders/particle_vert.glsl SRC)
  
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_simple_mix_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_painting_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_paper_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_frag.glsl SRC)
 +
  list(APPEND INC
  )