diff options
Diffstat (limited to 'release/scripts/startup')
| -rw-r--r-- | release/scripts/startup/bl_operators/__init__.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/freestyle.py | 71 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 408 |
3 files changed, 479 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py index d5f7a63366a..53991526844 100644 --- a/release/scripts/startup/bl_operators/__init__.py +++ b/release/scripts/startup/bl_operators/__init__.py @@ -25,6 +25,7 @@ if "bpy" in locals(): _modules = ( "add_mesh_torus", "animsys_update", + "freestyle", "image", "mesh", "nla", diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py new file mode 100644 index 00000000000..6d0cac65e8e --- /dev/null +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -0,0 +1,71 @@ +# ##### BEGIN GPL LICENSE BLOCK ##### +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# ##### END GPL LICENSE BLOCK ##### + +import bpy + +from bpy.props import (EnumProperty, StringProperty) + + +class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): + '''Fill the Range Min/Max entries by the min/max distance between selected mesh objects and the source object (either a user-specified object or the active camera).''' + bl_idname = "scene.freestyle_fill_range_by_selection" + bl_label = "Fill Range by Selection" + + type = EnumProperty(name="Type", description="Type of the modifier to work on.", + items=[("COLOR", "Color", "Color modifier type."), + ("ALPHA", "Alpha", "Alpha modifier type."), + ("THICKNESS", "Thickness", "Thickness modifier type.")]) + name = StringProperty(name="Name", description="Name of the modifier to work on.") + + def execute(self, context): + rl = context.scene.render.layers.active + lineset = rl.freestyle_settings.linesets.active + linestyle = lineset.linestyle + # Find the modifier to work on + if self.type == 'COLOR': + m = linestyle.color_modifiers[self.name] + elif self.type == 'ALPHA': + m = linestyle.alpha_modifiers[self.name] + else: + m = linestyle.thickness_modifiers[self.name] + # Find the source object + if m.type == 'DISTANCE_FROM_CAMERA': + source = context.scene.camera + elif m.type == 'DISTANCE_FROM_OBJECT': + if m.target is None: + self.report({'ERROR'}, "Target object not specified") + return {'CANCELLED'} + source = m.target + else: + self.report({'ERROR'}, "Unexpected modifier type: " + m.type) + return {'CANCELLED'} + # Find selected mesh objects + selection = [ob for ob in context.scene.objects if ob.select and ob.type == 'MESH' and ob.name != source.name] + if len(selection) > 0: + # Compute the min/max distance between selected mesh objects and the source + min_dist = float('inf') + max_dist = -min_dist + for ob in selection: + for vert in ob.data.vertices: + dist = (ob.matrix_world * vert.co - source.location).length + min_dist = min(dist, min_dist) + max_dist = max(dist, max_dist) + # Fill the Range Min/Max entries with the computed distances + m.range_min = min_dist + m.range_max = max_dist + return {'FINISHED'} diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 395cfc6934e..5a1ddb4b9df 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -123,11 +123,12 @@ class RENDER_PT_layers(RenderButtonsPanel, Panel): col.prop(rl, "use_solid") col.prop(rl, "use_halo") col.prop(rl, "use_ztransp") + col.prop(rl, "use_sky") col = split.column() - col.prop(rl, "use_sky") col.prop(rl, "use_edge_enhance") col.prop(rl, "use_strand") + col.prop(rl, "use_freestyle") layout.separator() @@ -174,6 +175,406 @@ class RENDER_PT_layers(RenderButtonsPanel, Panel): row.prop(rl, "exclude_refraction", text="") +class RENDER_PT_freestyle(RenderButtonsPanel, Panel): + bl_label = "Freestyle" + COMPAT_ENGINES = {'BLENDER_RENDER'} + + @classmethod + def poll(cls, context): + rd = context.scene.render + rl = rd.layers.active + return rl and rl.use_freestyle + + def draw(self, context): + layout = self.layout + + rd = context.scene.render + rl = rd.layers.active + freestyle = rl.freestyle_settings + + split = layout.split() + + col = split.column() + col.prop(freestyle, "raycasting_algorithm", text="Raycasting Algorithm") + col.prop(freestyle, "mode", text="Control Mode") + + if freestyle.mode == "EDITOR": + col.label(text="Edge Detection Options:") + col.prop(freestyle, "use_smoothness") + col.prop(freestyle, "crease_angle") + col.prop(freestyle, "sphere_radius") + col.prop(freestyle, "kr_derivative_epsilon") + + lineset = freestyle.linesets.active + + col.label(text="Line Sets:") + row = col.row() + rows = 2 + if lineset: + rows = 5 + row.template_list(freestyle, "linesets", freestyle.linesets, "active_index", rows=rows) + + sub = row.column() + subsub = sub.column(align=True) + subsub.operator("scene.freestyle_lineset_add", icon='ZOOMIN', text="") + subsub.operator("scene.freestyle_lineset_remove", icon='ZOOMOUT', text="") + if lineset: + sub.separator() + subsub = sub.column(align=True) + subsub.operator("scene.freestyle_lineset_move", icon='TRIA_UP', text="").direction = 'UP' + subsub.operator("scene.freestyle_lineset_move", icon='TRIA_DOWN', text="").direction = 'DOWN' + + if lineset: + col.prop(lineset, "name") + + col.prop(lineset, "select_by_visibility") + if lineset.select_by_visibility: + sub = col.row(align=True) + sub.prop(lineset, "visibility", expand=True) + if lineset.visibility == "RANGE": + sub = col.row(align=True) + sub.prop(lineset, "qi_start") + sub.prop(lineset, "qi_end") + col.separator() # XXX + + col.prop(lineset, "select_by_edge_types") + if lineset.select_by_edge_types: + row = col.row() + row.prop(lineset, "edge_type_negation", expand=True) + row = col.row() + row.prop(lineset, "edge_type_combination", expand=True) + + row = col.row() + sub = row.column() + sub.prop(lineset, "select_silhouette") + sub.prop(lineset, "select_border") + sub.prop(lineset, "select_crease") + sub.prop(lineset, "select_ridge") + sub.prop(lineset, "select_valley") + sub.prop(lineset, "select_suggestive_contour") + sub.prop(lineset, "select_material_boundary") + sub = row.column() + sub.prop(lineset, "select_contour") + sub.prop(lineset, "select_external_contour") + col.separator() # XXX + + col.prop(lineset, "select_by_group") + if lineset.select_by_group: + col.prop(lineset, "group") + row = col.row() + row.prop(lineset, "group_negation", expand=True) + col.separator() # XXX + + col.prop(lineset, "select_by_image_border") + + else: # freestyle.mode == "SCRIPT" + + col.prop(freestyle, "use_smoothness") + col.prop(freestyle, "crease_angle") + col.prop(freestyle, "sphere_radius") + col.prop(freestyle, "use_ridges_and_valleys") + col.prop(freestyle, "use_suggestive_contours") + sub = col.row() + sub.prop(freestyle, "kr_derivative_epsilon") + sub.active = freestyle.use_suggestive_contours + col.prop(freestyle, "use_material_boundaries") + col.operator("scene.freestyle_module_add") + + for i, module in enumerate(freestyle.modules): + box = layout.box() + box.context_pointer_set("freestyle_module", module) + row = box.row(align=True) + row.prop(module, "use", text="") + row.prop(module, "module_path", text="") + row.operator("scene.freestyle_module_remove", icon='X', text="") + row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP' + row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN' + + +class RENDER_PT_freestyle_linestyle(RenderButtonsPanel, Panel): + bl_label = "Freestyle: Line Style" + COMPAT_ENGINES = {'BLENDER_RENDER'} + + @classmethod + def poll(cls, context): + rd = context.scene.render + rl = rd.layers.active + if rl and rl.use_freestyle: + freestyle = rl.freestyle_settings + return freestyle.mode == "EDITOR" and freestyle.linesets.active + return False + + def draw_modifier_box_header(self, box, modifier): + row = box.row() + row.context_pointer_set("modifier", modifier) + if modifier.expanded: + icon = "TRIA_DOWN" + else: + icon = "TRIA_RIGHT" + row.prop(modifier, "expanded", text="", icon=icon, emboss=False) + row.label(text=modifier.rna_type.name) + row.prop(modifier, "name", text="") + row.prop(modifier, "use", text="") + sub = row.row(align=True) + sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP' + sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN' + row.operator("scene.freestyle_modifier_remove", icon='X', text="") + + def draw_modifier_common(self, box, modifier): + row = box.row() + row.prop(modifier, "blend", text="") + row.prop(modifier, "influence") + + def draw_modifier_color_ramp_common(self, box, modifier, has_range): + box.template_color_ramp(modifier, "color_ramp", expand=True) + if has_range: + row = box.row(align=True) + row.prop(modifier, "range_min") + row.prop(modifier, "range_max") + + def draw_modifier_curve_common(self, box, modifier, has_range, has_value): + row = box.row() + row.prop(modifier, "mapping", text="") + sub = row.column() + sub.prop(modifier, "invert") + if modifier.mapping == "CURVE": + sub.enabled = False + box.template_curve_mapping(modifier, "curve") + if has_range: + row = box.row(align=True) + row.prop(modifier, "range_min") + row.prop(modifier, "range_max") + if has_value: + row = box.row(align=True) + row.prop(modifier, "value_min") + row.prop(modifier, "value_max") + + def draw_color_modifier(self, context, modifier): + layout = self.layout + + col = layout.column(align=True) + self.draw_modifier_box_header(col.box(), modifier) + if modifier.expanded: + box = col.box() + self.draw_modifier_common(box, modifier) + + if modifier.type == "ALONG_STROKE": + self.draw_modifier_color_ramp_common(box, modifier, False) + + elif modifier.type == "DISTANCE_FROM_OBJECT": + box.prop(modifier, "target") + self.draw_modifier_color_ramp_common(box, modifier, True) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'COLOR' + prop.name = modifier.name + + elif modifier.type == "DISTANCE_FROM_CAMERA": + self.draw_modifier_color_ramp_common(box, modifier, True) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'COLOR' + prop.name = modifier.name + + elif modifier.type == "MATERIAL": + row = box.row() + row.prop(modifier, "material_attr", text="") + sub = row.column() + sub.prop(modifier, "use_ramp") + if modifier.material_attr in ["DIFF", "SPEC"]: + sub.enabled = True + show_ramp = modifier.use_ramp + else: + sub.enabled = False + show_ramp = True + if show_ramp: + self.draw_modifier_color_ramp_common(box, modifier, False) + + def draw_alpha_modifier(self, context, modifier): + layout = self.layout + + col = layout.column(align=True) + self.draw_modifier_box_header(col.box(), modifier) + if modifier.expanded: + box = col.box() + self.draw_modifier_common(box, modifier) + + if modifier.type == "ALONG_STROKE": + self.draw_modifier_curve_common(box, modifier, False, False) + + elif modifier.type == "DISTANCE_FROM_OBJECT": + box.prop(modifier, "target") + self.draw_modifier_curve_common(box, modifier, True, False) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'ALPHA' + prop.name = modifier.name + + elif modifier.type == "DISTANCE_FROM_CAMERA": + self.draw_modifier_curve_common(box, modifier, True, False) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'ALPHA' + prop.name = modifier.name + + elif modifier.type == "MATERIAL": + box.prop(modifier, "material_attr", text="") + self.draw_modifier_curve_common(box, modifier, False, False) + + def draw_thickness_modifier(self, context, modifier): + layout = self.layout + + col = layout.column(align=True) + self.draw_modifier_box_header(col.box(), modifier) + if modifier.expanded: + box = col.box() + self.draw_modifier_common(box, modifier) + + if modifier.type == "ALONG_STROKE": + self.draw_modifier_curve_common(box, modifier, False, True) + + elif modifier.type == "DISTANCE_FROM_OBJECT": + box.prop(modifier, "target") + self.draw_modifier_curve_common(box, modifier, True, True) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'THICKNESS' + prop.name = modifier.name + + elif modifier.type == "DISTANCE_FROM_CAMERA": + self.draw_modifier_curve_common(box, modifier, True, True) + prop = box.operator("scene.freestyle_fill_range_by_selection") + prop.type = 'THICKNESS' + prop.name = modifier.name + + elif modifier.type == "MATERIAL": + box.prop(modifier, "material_attr", text="") + self.draw_modifier_curve_common(box, modifier, False, True) + + def draw_geometry_modifier(self, context, modifier): + layout = self.layout + + col = layout.column(align=True) + self.draw_modifier_box_header(col.box(), modifier) + if modifier.expanded: + box = col.box() + + if modifier.type == "SAMPLING": + box.prop(modifier, "sampling") + + elif modifier.type == "BEZIER_CURVE": + box.prop(modifier, "error") + + elif modifier.type == "SINUS_DISPLACEMENT": + box.prop(modifier, "wavelength") + box.prop(modifier, "amplitude") + box.prop(modifier, "phase") + + elif modifier.type == "SPATIAL_NOISE": + box.prop(modifier, "amplitude") + box.prop(modifier, "scale") + box.prop(modifier, "octaves") + sub = box.row() + sub.prop(modifier, "smooth") + sub.prop(modifier, "pure_random") + + elif modifier.type == "PERLIN_NOISE_1D": + box.prop(modifier, "frequency") + box.prop(modifier, "amplitude") + box.prop(modifier, "octaves") + box.prop(modifier, "angle") + box.prop(modifier, "seed") + + elif modifier.type == "PERLIN_NOISE_2D": + box.prop(modifier, "frequency") + box.prop(modifier, "amplitude") + box.prop(modifier, "octaves") + box.prop(modifier, "angle") + box.prop(modifier, "seed") + + elif modifier.type == "BACKBONE_STRETCHER": + box.prop(modifier, "amount") + + elif modifier.type == "TIP_REMOVER": + box.prop(modifier, "tip_length") + + def draw(self, context): + layout = self.layout + + rd = context.scene.render + rl = rd.layers.active + lineset = rl.freestyle_settings.linesets.active + linestyle = lineset.linestyle + + layout.template_ID(lineset, "linestyle", new="scene.freestyle_linestyle_new") + row = layout.row(align=True) + row.prop(linestyle, "panel", expand=True) + if linestyle.panel == "STROKES": + col = layout.column() + col.label(text="Chaining:") + col.prop(linestyle, "same_object") + col = layout.column() + col.label(text="Splitting:") + row = col.row(align=True) + row.prop(linestyle, "material_boundary") + col = layout.column() + col.label(text="Caps:") + row = col.row(align=True) + row.prop(linestyle, "caps", expand=True) + col = layout.column() + col.prop(linestyle, "use_dashed_line") + split = col.split() + split.enabled = linestyle.use_dashed_line + sub = split.column() + sub.label(text="Dash") + sub.prop(linestyle, "dash1", text="") + sub = split.column() + sub.label(text="Gap") + sub.prop(linestyle, "gap1", text="") + sub = split.column() + sub.label(text="Dash") + sub.prop(linestyle, "dash2", text="") + sub = split.column() + sub.label(text="Gap") + sub.prop(linestyle, "gap2", text="") + sub = split.column() + sub.label(text="Dash") + sub.prop(linestyle, "dash3", text="") + sub = split.column() + sub.label(text="Gap") + sub.prop(linestyle, "gap3", text="") + elif linestyle.panel == "COLOR": + col = layout.column() + col.label(text="Base Color:") + col.prop(linestyle, "color", text="") + col = layout.column() + col.label(text="Modifiers:") + col.operator_menu_enum("scene.freestyle_color_modifier_add", "type", text="Add Modifier") + for modifier in linestyle.color_modifiers: + self.draw_color_modifier(context, modifier) + elif linestyle.panel == "ALPHA": + col = layout.column() + col.label(text="Base Transparency:") + col.prop(linestyle, "alpha") + col = layout.column() + col.label(text="Modifiers:") + col.operator_menu_enum("scene.freestyle_alpha_modifier_add", "type", text="Add Modifier") + for modifier in linestyle.alpha_modifiers: + self.draw_alpha_modifier(context, modifier) + elif linestyle.panel == "THICKNESS": + col = layout.column() + col.label(text="Base Thickness:") + col.prop(linestyle, "thickness") + col = layout.column() + col.label(text="Modifiers:") + col.operator_menu_enum("scene.freestyle_thickness_modifier_add", "type", text="Add Modifier") + for modifier in linestyle.thickness_modifiers: + self.draw_thickness_modifier(context, modifier) + elif linestyle.panel == "GEOMETRY": + col = layout.column() + col.label(text="Modifiers:") + col.operator_menu_enum("scene.freestyle_geometry_modifier_add", "type", text="Add Modifier") + for modifier in linestyle.geometry_modifiers: + self.draw_geometry_modifier(context, modifier) + elif linestyle.panel == "MISC": + pass + + class RENDER_PT_dimensions(RenderButtonsPanel, Panel): bl_label = "Dimensions" COMPAT_ENGINES = {'BLENDER_RENDER'} @@ -398,6 +799,11 @@ class RENDER_PT_post_processing(RenderButtonsPanel, Panel): sub.prop(rd, "edge_threshold", text="Threshold", slider=True) sub.prop(rd, "edge_color", text="") + layout.separator() + + split = layout.split() + col = split.column() + col.prop(rd, "use_freestyle", text="Freestyle") class RENDER_PT_stamp(RenderButtonsPanel, Panel): bl_label = "Stamp" |