8e8d93eb86
The initial design assumed that there was only one object for each unique name, but that was not the case when instances were created. Now, instances are supported and speed has been greatly improved when repetitions are used. As a result of this change, the option to create objects has been removed in the Instances modifier. This option was strange and was also against Blender's design rules, since a modifier should never create objects. The old functionality of the modifier can be achieved with instances. Also, several memory leakage problems that were not previously detected have been eliminated, and especially in the grid and in the drawing process Onion Skin is not supported in multi-user datablocks. Support this, makes incompatible with instances. We need find a solution in the long term, but now it's better keep disabled and make instances work. Anyway, the new instances makes unnecessary to use muli-user datablocks.
408 lines
13 KiB
Python
408 lines
13 KiB
Python
# ##### 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 #####
|
|
|
|
# <pep8 compliant>
|
|
import bpy
|
|
from bpy.types import Menu, Panel, UIList
|
|
from rna_prop_ui import PropertyPanel
|
|
from .properties_grease_pencil_common import (
|
|
GreasePencilDataPanel,
|
|
GreasePencilOnionPanel,
|
|
)
|
|
|
|
###############################
|
|
# Base-Classes (for shared stuff - e.g. poll, attributes, etc.)
|
|
|
|
|
|
class DataButtonsPanel:
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
return context.object and context.object.type == 'GPENCIL'
|
|
|
|
|
|
class LayerDataButtonsPanel:
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
return (context.object and
|
|
context.object.type == 'GPENCIL' and
|
|
context.active_gpencil_layer)
|
|
|
|
|
|
###############################
|
|
# GP Object Properties Panels and Helper Classes
|
|
|
|
class DATA_PT_gpencil(DataButtonsPanel, Panel):
|
|
bl_label = ""
|
|
bl_options = {'HIDE_HEADER'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
# Grease Pencil data selector
|
|
gpd_owner = context.gpencil_data_owner
|
|
gpd = context.gpencil_data
|
|
|
|
layout.template_ID(gpd_owner, "data")
|
|
|
|
|
|
class GPENCIL_UL_layer(UIList):
|
|
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
|
|
# assert(isinstance(item, bpy.types.GPencilLayer)
|
|
gpl = item
|
|
gpd = context.gpencil_data
|
|
|
|
if self.layout_type in {'DEFAULT', 'COMPACT'}:
|
|
if gpl.lock:
|
|
layout.active = False
|
|
|
|
row = layout.row(align=True)
|
|
if gpl.is_parented:
|
|
icon = 'BONE_DATA'
|
|
else:
|
|
icon = 'BLANK1'
|
|
|
|
row.label(text="", icon=icon)
|
|
row.prop(gpl, "info", text="", emboss=False)
|
|
|
|
row = layout.row(align=True)
|
|
row.prop(gpl, "lock", text="", emboss=False)
|
|
row.prop(gpl, "hide", text="", emboss=False)
|
|
row.prop(gpl, "unlock_color", text="", emboss=False)
|
|
if gpl.use_onion_skinning is False:
|
|
icon = 'GHOST_DISABLED'
|
|
else:
|
|
icon = 'GHOST_ENABLED'
|
|
subrow = row.row(align=True)
|
|
subrow.prop(gpl, "use_onion_skinning", text="", icon=icon, emboss=False)
|
|
subrow.active = gpd.use_onion_skinning
|
|
elif self.layout_type == 'GRID':
|
|
layout.alignment = 'CENTER'
|
|
layout.label(text="", icon_value=icon)
|
|
|
|
|
|
class GPENCIL_MT_layer_specials(Menu):
|
|
bl_label = "Layer"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.operator("gpencil.layer_duplicate", icon='COPY_ID') # XXX: needs a dedicated icon
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("gpencil.reveal", icon='RESTRICT_VIEW_OFF', text="Show All")
|
|
layout.operator("gpencil.hide", icon='RESTRICT_VIEW_ON', text="Hide Others").unselected = True
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("gpencil.lock_all", icon='LOCKED', text="Lock All")
|
|
layout.operator("gpencil.unlock_all", icon='UNLOCKED', text="UnLock All")
|
|
|
|
layout.separator()
|
|
|
|
layout.operator("gpencil.layer_merge", icon='NLA', text="Merge Down")
|
|
|
|
|
|
class DATA_PT_gpencil_datapanel(Panel):
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
bl_label = "Layers"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
if context.gpencil_data is None:
|
|
return False
|
|
|
|
ob = context.object
|
|
if ob is not None and ob.type == 'GPENCIL':
|
|
return True
|
|
|
|
return False
|
|
|
|
@staticmethod
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
#layout.use_property_split = True
|
|
layout.use_property_decorate = False
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
# Grease Pencil data...
|
|
if (gpd is None) or (not gpd.layers):
|
|
layout.operator("gpencil.layer_add", text="New Layer")
|
|
else:
|
|
self.draw_layers(context, layout, gpd)
|
|
|
|
def draw_layers(self, context, layout, gpd):
|
|
row = layout.row()
|
|
|
|
col = row.column()
|
|
if len(gpd.layers) >= 2:
|
|
layer_rows = 5
|
|
else:
|
|
layer_rows = 2
|
|
col.template_list("GPENCIL_UL_layer", "", gpd, "layers", gpd.layers, "active_index", rows=layer_rows)
|
|
|
|
col = row.column()
|
|
|
|
sub = col.column(align=True)
|
|
sub.operator("gpencil.layer_add", icon='ZOOMIN', text="")
|
|
sub.operator("gpencil.layer_remove", icon='ZOOMOUT', text="")
|
|
|
|
gpl = context.active_gpencil_layer
|
|
if gpl:
|
|
sub.menu("GPENCIL_MT_layer_specials", icon='DOWNARROW_HLT', text="")
|
|
|
|
if len(gpd.layers) > 1:
|
|
col.separator()
|
|
|
|
sub = col.column(align=True)
|
|
sub.operator("gpencil.layer_move", icon='TRIA_UP', text="").type = 'UP'
|
|
sub.operator("gpencil.layer_move", icon='TRIA_DOWN', text="").type = 'DOWN'
|
|
|
|
col.separator()
|
|
|
|
sub = col.column(align=True)
|
|
sub.operator("gpencil.layer_isolate", icon='LOCKED', text="").affect_visibility = False
|
|
sub.operator("gpencil.layer_isolate", icon='RESTRICT_VIEW_OFF', text="").affect_visibility = True
|
|
|
|
row = layout.row(align=True)
|
|
if gpl:
|
|
row.prop(gpl, "opacity", text="Opacity", slider=True)
|
|
|
|
|
|
class DATA_PT_gpencil_layer_optionpanel(LayerDataButtonsPanel, Panel):
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
bl_label = "Adjustments"
|
|
bl_parent_id = 'DATA_PT_gpencil_datapanel'
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
gpl = context.active_gpencil_layer
|
|
layout.active = not gpl.lock
|
|
|
|
# Layer options
|
|
# Offsets - Color Tint
|
|
layout.enabled = not gpl.lock
|
|
col = layout.column(align=True)
|
|
col.prop(gpl, "tint_color")
|
|
col.prop(gpl, "tint_factor", text="Factor", slider=True)
|
|
|
|
# Offsets - Thickness
|
|
col = layout.row(align=True)
|
|
col.prop(gpl, "line_change", text="Stroke Thickness")
|
|
|
|
|
|
class DATA_PT_gpencil_parentpanel(LayerDataButtonsPanel, Panel):
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
bl_label = "Relations"
|
|
bl_parent_id = 'DATA_PT_gpencil_datapanel'
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
layout.use_property_decorate = False
|
|
|
|
gpl = context.active_gpencil_layer
|
|
col = layout.column()
|
|
col.active = not gpl.lock
|
|
col.prop(gpl, "parent")
|
|
col.prop(gpl, "parent_type", text="Type")
|
|
parent = gpl.parent
|
|
|
|
if parent and gpl.parent_type == 'BONE' and parent.type == 'ARMATURE':
|
|
col.prop_search(gpl, "parent_bone", parent.data, "bones", text="Bone")
|
|
|
|
|
|
class DATA_PT_gpencil_onionpanel(Panel):
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
bl_label = "Onion Skinning"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
return bool(context.active_gpencil_layer)
|
|
|
|
@staticmethod
|
|
def draw_header(self, context):
|
|
self.layout.prop(context.gpencil_data, "use_onion_skinning", text="")
|
|
|
|
def draw(self, context):
|
|
gpd = context.gpencil_data
|
|
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
layout.enabled = gpd.use_onion_skinning and gpd.users <= 1
|
|
|
|
if gpd.use_onion_skinning and gpd.users > 1:
|
|
layout.label("Multiuser datablock not supported", icon='ERROR')
|
|
|
|
GreasePencilOnionPanel.draw_settings(layout, gpd)
|
|
|
|
|
|
class GPENCIL_MT_gpencil_vertex_group(Menu):
|
|
bl_label = "GP Vertex Groups"
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
layout.operator_context = 'EXEC_AREA'
|
|
layout.operator("object.vertex_group_add")
|
|
|
|
ob = context.active_object
|
|
if ob.vertex_groups.active:
|
|
layout.separator()
|
|
|
|
layout.operator("gpencil.vertex_group_assign", text="Assign to Active Group")
|
|
layout.operator("gpencil.vertex_group_remove_from", text="Remove from Active Group")
|
|
|
|
layout.separator()
|
|
layout.operator_menu_enum("object.vertex_group_set_active", "group", text="Set Active Group")
|
|
layout.operator("object.vertex_group_remove", text="Remove Active Group").all = False
|
|
layout.operator("object.vertex_group_remove", text="Remove All Groups").all = True
|
|
|
|
layout.separator()
|
|
layout.operator("gpencil.vertex_group_select", text="Select Points")
|
|
layout.operator("gpencil.vertex_group_deselect", text="Deselect Points")
|
|
|
|
|
|
class GPENCIL_UL_vgroups(UIList):
|
|
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
|
|
vgroup = item
|
|
if self.layout_type in {'DEFAULT', 'COMPACT'}:
|
|
layout.prop(vgroup, "name", text="", emboss=False, icon_value=icon)
|
|
# icon = 'LOCKED' if vgroup.lock_weight else 'UNLOCKED'
|
|
# layout.prop(vgroup, "lock_weight", text="", icon=icon, emboss=False)
|
|
elif self.layout_type == 'GRID':
|
|
layout.alignment = 'CENTER'
|
|
layout.label(text="", icon_value=icon)
|
|
|
|
|
|
class DATA_PT_gpencil_vertexpanel(DataButtonsPanel, Panel):
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
bl_label = "Vertex Groups"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
ob = context.object
|
|
group = ob.vertex_groups.active
|
|
|
|
rows = 2
|
|
if group:
|
|
rows = 4
|
|
|
|
row = layout.row()
|
|
row.template_list("GPENCIL_UL_vgroups", "", ob, "vertex_groups", ob.vertex_groups, "active_index", rows=rows)
|
|
|
|
col = row.column(align=True)
|
|
col.operator("object.vertex_group_add", icon='ZOOMIN', text="")
|
|
col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="").all = False
|
|
|
|
if ob.vertex_groups:
|
|
row = layout.row()
|
|
|
|
sub = row.row(align=True)
|
|
sub.operator("gpencil.vertex_group_assign", text="Assign")
|
|
sub.operator("gpencil.vertex_group_remove_from", text="Remove")
|
|
|
|
sub = row.row(align=True)
|
|
sub.operator("gpencil.vertex_group_select", text="Select")
|
|
sub.operator("gpencil.vertex_group_deselect", text="Deselect")
|
|
|
|
layout.prop(context.tool_settings, "vertex_group_weight", text="Weight")
|
|
|
|
|
|
class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
|
|
bl_label = "Viewport Display"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
ob = context.object
|
|
|
|
gpd = context.gpencil_data
|
|
gpl = context.active_gpencil_layer
|
|
|
|
layout.prop(gpd, "xray_mode", text="Depth Ordering")
|
|
layout.prop(gpd, "edit_line_color", text="Edit Line Color")
|
|
layout.prop(ob, "empty_draw_size", text="Marker Size")
|
|
|
|
col = layout.column(align=True)
|
|
col.prop(gpd, "show_constant_thickness")
|
|
sub = col.column()
|
|
sub.active = not gpd.show_constant_thickness
|
|
sub.prop(gpd, "pixfactor", text="Thickness Scale")
|
|
|
|
if gpl:
|
|
layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")
|
|
|
|
|
|
class DATA_PT_custom_props_gpencil(DataButtonsPanel, PropertyPanel, Panel):
|
|
_context_path = "object.data"
|
|
_property_type = bpy.types.GreasePencil
|
|
|
|
###############################
|
|
|
|
|
|
classes = (
|
|
DATA_PT_gpencil,
|
|
DATA_PT_gpencil_datapanel,
|
|
DATA_PT_gpencil_onionpanel,
|
|
DATA_PT_gpencil_layer_optionpanel,
|
|
DATA_PT_gpencil_parentpanel,
|
|
DATA_PT_gpencil_vertexpanel,
|
|
DATA_PT_gpencil_display,
|
|
DATA_PT_custom_props_gpencil,
|
|
|
|
GPENCIL_UL_layer,
|
|
GPENCIL_UL_vgroups,
|
|
|
|
GPENCIL_MT_layer_specials,
|
|
GPENCIL_MT_gpencil_vertex_group,
|
|
)
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|