[Bf-blender-cvs] [28823638f1d] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: 28823638f1dc254a78d48467c170e81d5832daa1
Author: Nick Wu
Date:   Mon Jun 11 09:54:18 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB28823638f1dc254a78d48467c170e81d5832daa1

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Conflicts:
	source/tools

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index b10046654a3,4c5b1a86235..4a322d0670c
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -475,83 -475,9 +475,83 @@@ class SCENE_PT_viewport_display(SceneBu
          col.prop(scene.display, "light_direction")
          col.prop(scene.display, "shadow_shift")
  
 +class SCENE_PT_lanpr(SceneButtonsPanel, PropertyPanel, Panel):
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +    bl_label = "LANPR AHOY"
 +    
 +    @classmethod
 +    def poll(cls, context):
 +        return True
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +
 +        layout.prop(lanpr, "master_mode")
 +
 +        if lanpr.master_mode == "DPIX":
 +            layout.label(text="DPIX:")
 +            layout.prop(lanpr, "reloaded")
 +            split = layout.split()
 +            col = split.column()
 +            col.prop(lanpr, "background_color")
 +            col = split.column()
 +            col.prop(lanpr, "line_color")
 +            
 +        else:
 +            layout.label(text="Snake:")
 +            layout.prop(lanpr, "enable_vector_trace")
 +
 +            if lanpr.enable_vector_trace == "DISABLED":
 +                layout.prop(lanpr, "display_thinning_result")
 +
 +            layout.prop(lanpr, "depth_clamp")
 +            layout.prop(lanpr, "depth_strength")
 +            layout.prop(lanpr, "normal_clamp")
 +            layout.prop(lanpr, "normal_strength")
 +
 +            if lanpr.enable_vector_trace == "ENABLED":
 +
 +                split = layout.split()
 +                col = split.column()
 +                col.prop(lanpr, "background_color")
 +                col = split.column()
 +                col.prop(lanpr, "line_color")
 +                
 +                layout.label(text="Thickness:")
 +                layout.prop(lanpr, "line_thickness")
 +
 +                layout.label(text="Effect Settings:")
 +
 +                layout.prop(lanpr, "use_same_taper")
 +
 +                if lanpr.use_same_taper == "DISABLED":
 +                    split = layout.split()
 +                    col = split.column()
 +                    col.label(text="Left:")
 +                    col.prop(lanpr,"taper_left_distance")
 +                    col.prop(lanpr,"taper_left_strength")
 +                    col = split.column()
 +                    col.label(text="Right:")
 +                    col.prop(lanpr,"taper_right_distance")
 +                    col.prop(lanpr,"taper_right_strength")
 +                else:
 +                    layout.prop(lanpr,"taper_left_distance")
 +                    layout.prop(lanpr,"taper_left_strength") 
 +
 +                layout.prop(lanpr, "enable_tip_extend")
 +                if lanpr.enable_tip_extend == "ENABLED":
 +                    layout.prop(lanpr,"extend_length")
 +            
 +            else: #disabled vectorization
 +                layout.label(text="Adjust values to avoid large pure white regions!")
 +                
 +
 +
  
  class SCENE_PT_viewport_display_ssao(SceneButtonsPanel, Panel):
-     bl_label = "Viewport Display SSAO"
+     bl_label = "Screen Space Ambient Occlusion"
      bl_parent_id = "SCENE_PT_viewport_display"
  
      @classmethod