[Bf-blender-cvs] [3b36c698cd1] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Nick Wu
noreply at git.blender.org
Wed Aug 1 06:08:47 CEST 2018
Commit: 3b36c698cd13ff01cd718ad633070eaef15fdc2c
Author: Nick Wu
Date: Wed Aug 1 10:15:47 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB3b36c698cd13ff01cd718ad633070eaef15fdc2c
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_scene.py
# source/blender/draw/CMakeLists.txt
# source/blender/editors/space_outliner/outliner_draw.c
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 8bf22bd3b16,e324e7a9882..a8598e2ddcb
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -568,363 -568,37 +568,391 @@@ 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 = "Grease Pencil"
+ bl_parent_id = "SCENE_PT_simplify"
+ 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
+ layout.use_property_split = True
+
+ rd = context.scene.render
+
+ layout.active = rd.simplify_gpencil
+
+ col = layout.column()
+ col.prop(rd, "simplify_gpencil_onplay", text="Playback Only")
+ col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers")
+
+ col = layout.column(align=True)
+ col.prop(rd, "simplify_gpencil_view_fill")
+ sub = col.column()
+ sub.active = rd.simplify_gpencil_view_fill
+ sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines")
+
+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_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL'}
+ 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")
+
+ if lanpr.master_mode == "SOFTWARE":
+ layout.prop(lanpr, "background_color")
+ layout.label(text="Enable On Demand:")
+ row = layout.row()
+ row.prop(lanpr,"enable_intersections", text = "Intersection Lines")
+ row.prop(lanpr,"enable_chaining", text = "Chaining (SLOW!)")
+ layout.label(text="RUN:")
+ layout.operator("scene.lanpr_calculate", icon='RENDER_STILL')
+
+ split = layout.split(percentage=0.7)
+ col = split.column()
+ col.label(text="Layer Composition:")
+ col = split.column()
+ col.operator("scene.lanpr_auto_create_line_layer", text = "Default", icon = "ZOOMIN")
+ layout.template_list("LANPR_linesets", "", lanpr, "layers", lanpr.layers, "active_layer_index", rows=4)
+ 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_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL'}
+
+ @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
+
+ layout.operator("scene.lanpr_enable_all_line_types")
+
+ 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.enable_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,"enable_intersections", toggle = True, text = "Enable")
+ if lanpr.enable_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_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL'}
+
+ @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" and not lanpr.enable_chaining
+
+ 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_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL'}
+
+ @classmethod
+ def poll(cls, context):
+ scene = context.scene
+ lanpr = scene.lanpr
+ return lanpr.master_mode == "DPIX"
+
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list