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

Nick Wu noreply at git.blender.org
Mon Jun 4 17:44:12 CEST 2018


Commit: 6e44f612b0dee8a118d32b1bcfaf7d0d4eb2b561
Author: Nick Wu
Date:   Mon Jun 4 10:14:22 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB6e44f612b0dee8a118d32b1bcfaf7d0d4eb2b561

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

Conflicts:
	release/scripts/addons
	release/scripts/addons_contrib

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 4f1c19f61c2,731a4586e42..bf25bfc9a59
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -439,71 -439,12 +439,73 @@@ class SCENE_PT_viewport_display(SceneBu
  
      def draw(self, context):
          layout = self.layout
+         layout.use_property_split = True
          scene = context.scene
-         layout.prop(scene.display, "light_direction", text="")
-         layout.prop(scene.display, "shadow_shift")
+         col = layout.column()
+         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.label(text="Global:")
 +        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_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
      COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
diff --cc source/blender/draw/CMakeLists.txt
index 0f6ad0fee28,40fd8762821..c867336912f
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -241,17 -236,9 +244,19 @@@ data_to_c_simple(engines/workbench/shad
  data_to_c_simple(engines/workbench/shaders/workbench_shadow_debug_frag.glsl SRC)
  data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)
  
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_preview.geometry SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_clip.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_atlas_project_passthrough.vertex SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_image_peel.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.vertex SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.geometry SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_line_connection.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge.fragment SRC)
 +data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel.fragment SRC)
 +
  data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
+ data_to_c_simple(modes/shaders/common_hair_lib.glsl SRC)
+ data_to_c_simple(modes/shaders/common_hair_refine_vert.glsl SRC)
  data_to_c_simple(modes/shaders/common_view_lib.glsl SRC)
  data_to_c_simple(modes/shaders/common_fxaa_lib.glsl SRC)
  data_to_c_simple(modes/shaders/common_fullscreen_vert.glsl SRC)



More information about the Bf-blender-cvs mailing list