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

Nick Wu noreply at git.blender.org
Mon Jul 23 16:34:38 CEST 2018


Commit: aa6563d3a9bd46fd170b6ae493d8db885d2422b7
Author: Nick Wu
Date:   Mon Jul 23 10:55:48 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBaa6563d3a9bd46fd170b6ae493d8db885d2422b7

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

# Conflicts:
#	release/scripts/startup/bl_ui/space_view3d.py
#	source/blender/draw/intern/draw_manager.c

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index f34c0897457,38bfc6ad294..d8cc00d7afd
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -481,315 -568,8 +568,315 @@@ class SCENE_PT_simplify_render(SceneBut
          col.prop(rd, "simplify_child_particles_render", text="Max Child Particles")
  
  
 +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
 +        layout.use_property_split = True
 +        scene = context.scene
 +        col = layout.column()
 +        col.prop(scene.display, "light_direction")
 +        col.prop(scene.display, "shadow_shift")
 +
 +class LANPR_linesets(UIList):
 +    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
 +        lineset = item
 +        if self.layout_type in {'DEFAULT', 'COMPACT'}:
 +            split = layout.split(percentage=0.6)
 +            split.label(text="Layer")
 +            row = split.row(align=True)
 +            row.prop(lineset, "color", text="", icon_value=icon)
 +            row.prop(lineset, "thickness", text="", icon_value=icon)
 +        elif self.layout_type == 'GRID':
 +            layout.alignment = 'CENTER'
 +            layout.label("", icon_value=icon)
 +
 +class SCENE_PT_lanpr(SceneButtonsPanel, Panel):
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +    bl_label = "LANPR"
 +    bl_options = {'DEFAULT_CLOSED'}
 +    
 +    @classmethod
 +    def poll(cls, context):
 +        return True
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +
 +        layout.prop(lanpr, "master_mode", expand=True) 
 +
 +        if lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE":
 +            if lanpr.master_mode == "DPIX":
 +                layout.prop(lanpr, "reloaded")
 +
 +            rows = 4
 +            if lanpr.master_mode == "SOFTWARE":
 +                layout.label(text="Enable On Demand:")
 +                layout.prop(lanpr,"calculate_intersections", toggle = True, text = "Enable Intersection Lines")
 +                layout.label(text="RUN:")
 +                layout.operator("scene.lanpr_calculate", icon='RENDER_STILL')
 +                layout.label(text="Layer Composition:")
 +                layout.template_list("LANPR_linesets", "", lanpr, "layers", lanpr.layers, "active_layer_index", rows=rows)
 +                if active_layer:
 +                    split = layout.split()
 +                    col = split.column()
 +                    col.operator("scene.lanpr_add_line_layer", icon="ZOOMIN")
 +                    col.operator("scene.lanpr_delete_line_layer", icon="ZOOMOUT")
 +                    col = split.column()
 +                    col.operator("scene.lanpr_move_line_layer", icon="TRIA_UP").direction = "UP"
 +                    col.operator("scene.lanpr_move_line_layer", icon="TRIA_DOWN").direction = "DOWN"
 +                    layout.operator("scene.lanpr_rebuild_all_commands")
 +                else:
 +                    layout.operator("scene.lanpr_add_line_layer")
 +            elif not lanpr.layers.active_layer:
 +                layout.operator("scene.lanpr_add_line_layer")
 +            
 +        else:
 +            layout.label(text="Vectorization:")
 +            layout.prop(lanpr, "enable_vector_trace", expand = True)
 +
 +            #col = layout.column()
 +            #col.label(text="Enable:")
 +            #row = col.row(align=True)
 +            #row.prop(lanpr, "enable_edge_mark", text="Mark", toggle=True)
 +            #row.prop(lanpr, "enable_material_seperate", text="Material", toggle=True)
 +
 +
 +class SCENE_PT_lanpr_line_types(SceneButtonsPanel, Panel):
 +    bl_label = "Types"
 +    bl_parent_id = "SCENE_PT_lanpr"
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +        return active_layer and lanpr.master_mode != "SNAKE"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +
 +        split = layout.split(percentage=0.3)
 +        col = split.column()
 +        col.prop(active_layer, "enable_contour", text="Contour", toggle=True)
 +        col.prop(active_layer, "enable_crease", text="Crease", toggle=True)
 +        col.prop(active_layer, "enable_edge_mark", text="Mark", toggle=True)
 +        col.prop(active_layer, "enable_material_seperate", text="Material", toggle=True)
 +        col.prop(active_layer, "enable_intersection", text="Intersection", toggle=True)
 +        col = split.column()
 +        row = col.row(align = True)
 +        #row.enabled = active_layer.enable_contour this is always enabled now
 +        row.prop(active_layer, "color", text="")
 +        row.prop(active_layer, "thickness", text="")
 +        row = col.row(align = True)
 +        row.enabled = active_layer.enable_crease
 +        row.prop(active_layer, "crease_color", text="")
 +        row.prop(active_layer, "thickness_crease", text="")
 +        row = col.row(align = True)
 +        row.enabled = active_layer.enable_edge_mark
 +        row.prop(active_layer, "edge_mark_color", text="")
 +        row.prop(active_layer, "thickness_edge_mark", text="")
 +        row = col.row(align = True)
 +        row.enabled = active_layer.enable_material_seperate
 +        row.prop(active_layer, "material_color", text="")
 +        row.prop(active_layer, "thickness_material", text="")
 +        row = col.row(align = True)
 +        if lanpr.calculate_intersections:
 +            row.enabled = active_layer.enable_intersection
 +            row.prop(active_layer, "intersection_color", text="")
 +            row.prop(active_layer, "thickness_intersection", text="")
 +        else:
 +            row.label(text= "Intersection Calculation Disabled")
 +
 +        if lanpr.master_mode == "DPIX" and active_layer.enable_intersection:
 +            row = col.row(align = True)
 +            row.prop(lanpr,"calculate_intersections", toggle = True, text = "Enable")
 +            if lanpr.calculate_intersections:
 +                row.operator("scene.lanpr_calculate", text= "Recalculate")
 +
 +        if lanpr.master_mode == "SOFTWARE":
 +            row = layout.row(align=True)
 +            row.prop(active_layer, "qi_begin")
 +            row.prop(active_layer, "qi_end")
 +
 +class SCENE_PT_lanpr_line_components(SceneButtonsPanel, Panel):
 +    bl_label = "Including"
 +    bl_parent_id = "SCENE_PT_lanpr"
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +        return active_layer and lanpr.master_mode == "SOFTWARE"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +
 +        layout.operator("scene.lanpr_add_line_component", icon = "ZOOMIN")
 +        
 +        i=0
 +        for c in active_layer.components:
 +            split = layout.split(percentage=0.85)
 +            col = split.column()
 +            sp2 = col.split(percentage=0.4)
 +            cl = sp2.column()
 +            cl.prop(c,"component_mode", text = "")
 +            cl = sp2.column()
 +            if c.component_mode == "OBJECT":
 +                cl.prop(c,"object_select", text = "")
 +            elif c.component_mode == "MATERIAL":
 +                cl.prop(c,"material_select", text = "")
 +            elif c.component_mode == "COLLECTION":
 +                cl.prop(c,"collection_select", text = "")
 +            col = split.column()
 +            col.operator("scene.lanpr_delete_line_component", text="", icon = "ZOOMOUT").index=i
 +            i=i+1
 +
 +
 +class SCENE_PT_lanpr_line_effects(SceneButtonsPanel, Panel):
 +    bl_label = "Effects"
 +    bl_parent_id = "SCENE_PT_lanpr"
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        return lanpr.master_mode == "DPIX"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        active_layer = lanpr.layers.active_layer
 +
 +        row = layout.row(align = True)
 +        row.prop(lanpr, "crease_threshold")
 +        row.prop(lanpr, "crease_fade_threshold")
 +        row = layout.row(align = True)
 +        row.prop(lanpr, "depth_width_influence")
 +        row.prop(lanpr, "depth_width_curve")
 +        row = layout.row(align = True)
 +        row.prop(lanpr, "depth_alpha_influence")
 +        row.prop(lanpr, "depth_alpha_curve")
 +
 +class SCENE_PT_lanpr_snake_sobel_parameters(SceneButtonsPanel, Panel):
 +    bl_label = "Sobel Parameters"
 +    bl_parent_id = "SCENE_PT_lanpr"
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        return lanpr.master_mode == "SNAKE"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +        scene = context.scene
 +        lanpr = scene.lanpr
 +        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 == "DISABLED":
 +            layout.prop(lanpr, "display_thinning_result")
 +
 +class SCENE_PT_lanpr_snake_settings(SceneButtonsPanel, Panel):
 +    bl_label = "Snake Settings"
 +    bl_parent_id = "SCENE_PT_lanpr"
 +    COMPAT_ENGINES = {'BLENDER_CLAY'}
 +
 +    @classmethod
 +    def poll(cls, context):
 +        scene = context.scen

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list