Commit: 9fc81d8cea36a3d9a6862ac469b8973aaec703d1 Author: Yiming Wu Date: Fri Dec 7 22:53:30 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB9fc81d8cea36a3d9a6862ac469b8973aaec703d1
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr # Conflicts: # release/scripts/addons_contrib # release/scripts/startup/bl_ui/properties_data_camera.py # release/scripts/startup/bl_ui/properties_material.py # release/scripts/startup/bl_ui/properties_particle.py # release/scripts/startup/bl_ui/properties_physics_common.py # release/scripts/startup/bl_ui/properties_physics_rigidbody.py # release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py # release/scripts/startup/bl_ui/properties_physics_softbody.py # release/scripts/startup/bl_ui/properties_scene.py # release/scripts/startup/bl_ui/properties_view_layer.py # release/scripts/startup/bl_ui/properties_world.py # source/blender/draw/intern/draw_manager.c # source/blender/makesrna/intern/rna_scene.c =================================================================== =================================================================== diff --cc release/scripts/startup/bl_ui/properties_scene.py index b2f1558bcb8,32524ec092c..7169080a6dc --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@@ -507,455 -451,8 +507,455 @@@ class SCENE_PT_rigid_body_field_weights effector_weights_ui(self, context, rbw.effector_weights, 'RIGID_BODY') +class SCENE_PT_simplify(SceneButtonsPanel, Panel): + bl_label = "Simplify" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL', 'BLENDER_LANPR'} + + def draw_header(self, context): + rd = context.scene.render + self.layout.prop(rd, "use_simplify", text="") + + def draw(self, context): + pass + + +class SCENE_PT_simplify_viewport(SceneButtonsPanel, Panel): + bl_label = "Viewport" + bl_parent_id = "SCENE_PT_simplify" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL', 'BLENDER_LANPR'} + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + rd = context.scene.render + + layout.active = rd.use_simplify + + flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) + + col = flow.column() + col.prop(rd, "simplify_subdivision", text="Max Subdivision") + + col = flow.column() + col.prop(rd, "simplify_child_particles", text="Max Child Particles") + + +class SCENE_PT_simplify_render(SceneButtonsPanel, Panel): + bl_label = "Render" + bl_parent_id = "SCENE_PT_simplify" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL', 'BLENDER_LANPR'} + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + + rd = context.scene.render + + layout.active = rd.use_simplify + + flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True) + + col = flow.column() + col.prop(rd, "simplify_subdivision_render", text="Max Subdivision") + + col = flow.column() + 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.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX") + + 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(factor=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": + + layout.prop(lanpr, "background_color") + + if lanpr.master_mode == "SOFTWARE": + 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(factor=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").direction = "UP" + col.operator("scene.lanpr_move_line_layer").direction = "DOWN" + layout.operator("scene.lanpr_rebuild_all_commands") + else: + layout.operator("scene.lanpr_add_line_layer") + + layout.label(text= "Normal:") + layout.prop(active_layer,"normal_mode", expand = True) + if active_layer.normal_mode != "DISABLED": + layout.prop(active_layer,"normal_control_object") + layout.prop(active_layer,"normal_effect_inverse", toggle = True) + layout.prop(active_layer,"normal_ramp_begin") + layout.prop(active_layer,"normal_ramp_end") + layout.prop(active_layer,"normal_thickness_begin", slider=True) + layout.prop(active_layer,"normal_thickness_end", slider=True) + + 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) + + +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 + if active_layer and lanpr.master_mode == "DPIX": + active_layer = lanpr.layers[0] + + layout.operator("scene.lanpr_enable_all_line_types") + + split = layout.split(factor=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) + ro @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs