Removed most partical-related code from UI scripts.
There are a lot of cases here where deciding for removal is a bit tricky. Many features have options for "use_particles" and similar settings. Only features which actually store a particle object reference or work on actual particle data have been removed.
This commit is contained in:
@@ -1,17 +0,0 @@
|
||||
import bpy
|
||||
psys = bpy.context.particle_system
|
||||
cloth = bpy.context.particle_system.cloth
|
||||
settings = bpy.context.particle_system.cloth.settings
|
||||
collision = bpy.context.particle_system.cloth.collision_settings
|
||||
|
||||
settings.quality = 5
|
||||
settings.mass = 0.30000001192092896
|
||||
settings.bending_stiffness = 0.5
|
||||
psys.settings.bending_random = 0.0
|
||||
settings.bending_damping = 0.5
|
||||
settings.air_damping = 1.0
|
||||
settings.internal_friction = 0.0
|
||||
settings.density_target = 0.0
|
||||
settings.density_strength = 0.0
|
||||
settings.voxel_cell_size = 0.10000000149011612
|
||||
settings.pin_stiffness = 0.0
|
||||
@@ -47,239 +47,6 @@ def object_ensure_material(obj, mat_name):
|
||||
return mat
|
||||
|
||||
|
||||
class QuickFur(Operator):
|
||||
bl_idname = "object.quick_fur"
|
||||
bl_label = "Quick Fur"
|
||||
bl_options = {'REGISTER', 'UNDO'}
|
||||
|
||||
density = EnumProperty(
|
||||
name="Fur Density",
|
||||
items=(('LIGHT', "Light", ""),
|
||||
('MEDIUM', "Medium", ""),
|
||||
('HEAVY', "Heavy", "")),
|
||||
default='MEDIUM',
|
||||
)
|
||||
view_percentage = IntProperty(
|
||||
name="View %",
|
||||
min=1, max=100,
|
||||
soft_min=1, soft_max=100,
|
||||
default=10,
|
||||
)
|
||||
length = FloatProperty(
|
||||
name="Length",
|
||||
min=0.001, max=100,
|
||||
soft_min=0.01, soft_max=10,
|
||||
default=0.1,
|
||||
)
|
||||
|
||||
def execute(self, context):
|
||||
fake_context = context.copy()
|
||||
mesh_objects = [obj for obj in context.selected_objects
|
||||
if obj.type == 'MESH' and obj.mode == 'OBJECT']
|
||||
|
||||
if not mesh_objects:
|
||||
self.report({'ERROR'}, "Select at least one mesh object")
|
||||
return {'CANCELLED'}
|
||||
|
||||
mat = bpy.data.materials.new("Fur Material")
|
||||
mat.strand.tip_size = 0.25
|
||||
mat.strand.blend_distance = 0.5
|
||||
|
||||
for obj in mesh_objects:
|
||||
fake_context["object"] = obj
|
||||
bpy.ops.object.particle_system_add(fake_context)
|
||||
|
||||
psys = obj.particle_systems[-1]
|
||||
psys.settings.type = 'HAIR'
|
||||
|
||||
if self.density == 'LIGHT':
|
||||
psys.settings.count = 100
|
||||
elif self.density == 'MEDIUM':
|
||||
psys.settings.count = 1000
|
||||
elif self.density == 'HEAVY':
|
||||
psys.settings.count = 10000
|
||||
|
||||
psys.settings.child_nbr = self.view_percentage
|
||||
psys.settings.hair_length = self.length
|
||||
psys.settings.use_strand_primitive = True
|
||||
psys.settings.use_hair_bspline = True
|
||||
psys.settings.child_type = 'INTERPOLATED'
|
||||
|
||||
obj.data.materials.append(mat)
|
||||
psys.settings.material = len(obj.data.materials)
|
||||
|
||||
return {'FINISHED'}
|
||||
|
||||
|
||||
class QuickExplode(Operator):
|
||||
bl_idname = "object.quick_explode"
|
||||
bl_label = "Quick Explode"
|
||||
bl_options = {'REGISTER', 'UNDO'}
|
||||
|
||||
style = EnumProperty(
|
||||
name="Explode Style",
|
||||
items=(('EXPLODE', "Explode", ""),
|
||||
('BLEND', "Blend", "")),
|
||||
default='EXPLODE',
|
||||
)
|
||||
amount = IntProperty(
|
||||
name="Amount of pieces",
|
||||
min=2, max=10000,
|
||||
soft_min=2, soft_max=10000,
|
||||
default=100,
|
||||
)
|
||||
frame_duration = IntProperty(
|
||||
name="Duration",
|
||||
min=1, max=300000,
|
||||
soft_min=1, soft_max=10000,
|
||||
default=50,
|
||||
)
|
||||
|
||||
frame_start = IntProperty(
|
||||
name="Start Frame",
|
||||
min=1, max=300000,
|
||||
soft_min=1, soft_max=10000,
|
||||
default=1,
|
||||
)
|
||||
frame_end = IntProperty(
|
||||
name="End Frame",
|
||||
min=1, max=300000,
|
||||
soft_min=1, soft_max=10000,
|
||||
default=10,
|
||||
)
|
||||
|
||||
velocity = FloatProperty(
|
||||
name="Outwards Velocity",
|
||||
min=0, max=300000,
|
||||
soft_min=0, soft_max=10,
|
||||
default=1,
|
||||
)
|
||||
|
||||
fade = BoolProperty(
|
||||
name="Fade",
|
||||
description="Fade the pieces over time",
|
||||
default=True,
|
||||
)
|
||||
|
||||
def execute(self, context):
|
||||
fake_context = context.copy()
|
||||
obj_act = context.active_object
|
||||
|
||||
if obj_act is None or obj_act.type != 'MESH':
|
||||
self.report({'ERROR'}, "Active object is not a mesh")
|
||||
return {'CANCELLED'}
|
||||
|
||||
mesh_objects = [obj for obj in context.selected_objects
|
||||
if obj.type == 'MESH' and obj != obj_act]
|
||||
mesh_objects.insert(0, obj_act)
|
||||
|
||||
if self.style == 'BLEND' and len(mesh_objects) != 2:
|
||||
self.report({'ERROR'}, "Select two mesh objects")
|
||||
self.style = 'EXPLODE'
|
||||
return {'CANCELLED'}
|
||||
elif not mesh_objects:
|
||||
self.report({'ERROR'}, "Select at least one mesh object")
|
||||
return {'CANCELLED'}
|
||||
|
||||
for obj in mesh_objects:
|
||||
if obj.particle_systems:
|
||||
self.report({'ERROR'},
|
||||
"Object %r already has a "
|
||||
"particle system" % obj.name)
|
||||
|
||||
return {'CANCELLED'}
|
||||
|
||||
if self.fade:
|
||||
tex = bpy.data.textures.new("Explode fade", 'BLEND')
|
||||
tex.use_color_ramp = True
|
||||
|
||||
if self.style == 'BLEND':
|
||||
tex.color_ramp.elements[0].position = 0.333
|
||||
tex.color_ramp.elements[1].position = 0.666
|
||||
|
||||
tex.color_ramp.elements[0].color[3] = 1.0
|
||||
tex.color_ramp.elements[1].color[3] = 0.0
|
||||
|
||||
if self.style == 'BLEND':
|
||||
from_obj = mesh_objects[1]
|
||||
to_obj = mesh_objects[0]
|
||||
|
||||
for obj in mesh_objects:
|
||||
fake_context["object"] = obj
|
||||
bpy.ops.object.particle_system_add(fake_context)
|
||||
|
||||
settings = obj.particle_systems[-1].settings
|
||||
settings.count = self.amount
|
||||
settings.frame_start = self.frame_start
|
||||
settings.frame_end = self.frame_end - self.frame_duration
|
||||
settings.lifetime = self.frame_duration
|
||||
settings.normal_factor = self.velocity
|
||||
settings.render_type = 'NONE'
|
||||
|
||||
explode = obj.modifiers.new(name='Explode', type='EXPLODE')
|
||||
explode.use_edge_cut = True
|
||||
|
||||
if self.fade:
|
||||
explode.show_dead = False
|
||||
uv = obj.data.uv_textures.new("Explode fade")
|
||||
explode.particle_uv = uv.name
|
||||
|
||||
mat = object_ensure_material(obj, "Explode Fade")
|
||||
|
||||
mat.use_transparency = True
|
||||
mat.use_transparent_shadows = True
|
||||
mat.alpha = 0.0
|
||||
mat.specular_alpha = 0.0
|
||||
|
||||
tex_slot = mat.texture_slots.add()
|
||||
|
||||
tex_slot.texture = tex
|
||||
tex_slot.texture_coords = 'UV'
|
||||
tex_slot.uv_layer = uv.name
|
||||
|
||||
tex_slot.use_map_alpha = True
|
||||
|
||||
if self.style == 'BLEND':
|
||||
if obj == to_obj:
|
||||
tex_slot.alpha_factor = -1.0
|
||||
elem = tex.color_ramp.elements[1]
|
||||
else:
|
||||
elem = tex.color_ramp.elements[0]
|
||||
# Keep already defined alpha!
|
||||
elem.color[:3] = mat.diffuse_color
|
||||
else:
|
||||
tex_slot.use_map_color_diffuse = False
|
||||
|
||||
if self.style == 'BLEND':
|
||||
settings.physics_type = 'KEYED'
|
||||
settings.use_emit_random = False
|
||||
settings.rotation_mode = 'NOR'
|
||||
|
||||
psys = obj.particle_systems[-1]
|
||||
|
||||
fake_context["particle_system"] = obj.particle_systems[-1]
|
||||
bpy.ops.particle.new_target(fake_context)
|
||||
bpy.ops.particle.new_target(fake_context)
|
||||
|
||||
if obj == from_obj:
|
||||
psys.targets[1].object = to_obj
|
||||
else:
|
||||
psys.targets[0].object = from_obj
|
||||
settings.normal_factor = -self.velocity
|
||||
explode.show_unborn = False
|
||||
explode.show_dead = True
|
||||
else:
|
||||
settings.factor_random = self.velocity
|
||||
settings.angular_velocity_factor = self.velocity / 10.0
|
||||
|
||||
return {'FINISHED'}
|
||||
|
||||
def invoke(self, context, event):
|
||||
self.frame_start = context.scene.frame_current
|
||||
self.frame_end = self.frame_start + self.frame_duration
|
||||
return self.execute(context)
|
||||
|
||||
|
||||
def obj_bb_minmax(obj, min_co, max_co):
|
||||
for i in range(0, 8):
|
||||
bb_vec = obj.matrix_world * Vector(obj.bound_box[i])
|
||||
|
||||
@@ -384,36 +384,6 @@ class AddPresetFluid(AddPresetBase, Operator):
|
||||
preset_subdir = "fluid"
|
||||
|
||||
|
||||
class AddPresetHairDynamics(AddPresetBase, Operator):
|
||||
"""Add or remove a Hair Dynamics Preset"""
|
||||
bl_idname = "particle.hair_dynamics_preset_add"
|
||||
bl_label = "Add Hair Dynamics Preset"
|
||||
preset_menu = "PARTICLE_MT_hair_dynamics_presets"
|
||||
|
||||
preset_defines = [
|
||||
"psys = bpy.context.particle_system",
|
||||
"cloth = bpy.context.particle_system.cloth",
|
||||
"settings = bpy.context.particle_system.cloth.settings",
|
||||
"collision = bpy.context.particle_system.cloth.collision_settings",
|
||||
]
|
||||
|
||||
preset_subdir = "hair_dynamics"
|
||||
|
||||
preset_values = [
|
||||
"settings.quality",
|
||||
"settings.mass",
|
||||
"settings.bending_stiffness",
|
||||
"psys.settings.bending_random",
|
||||
"settings.bending_damping",
|
||||
"settings.air_damping",
|
||||
"settings.internal_friction",
|
||||
"settings.density_target",
|
||||
"settings.density_strength",
|
||||
"settings.voxel_cell_size",
|
||||
"settings.pin_stiffness",
|
||||
]
|
||||
|
||||
|
||||
class AddPresetSunSky(AddPresetBase, Operator):
|
||||
"""Add or remove a Sky & Atmosphere Preset"""
|
||||
bl_idname = "lamp.sunsky_preset_add"
|
||||
|
||||
@@ -199,8 +199,6 @@ class VIEW3D_OT_select_or_deselect_all(Operator):
|
||||
bpy.ops.armature.select_all(action='DESELECT')
|
||||
elif active_object.mode == 'POSE':
|
||||
bpy.ops.pose.select_all(action='DESELECT')
|
||||
elif active_object.mode == 'PARTICLE_EDIT':
|
||||
bpy.ops.particle.select_all(action='DESELECT')
|
||||
else:
|
||||
bpy.ops.object.select_all(action='DESELECT')
|
||||
else:
|
||||
|
||||
@@ -47,7 +47,6 @@ _modules = [
|
||||
"properties_object",
|
||||
"properties_paint_common",
|
||||
"properties_grease_pencil_common",
|
||||
"properties_particle",
|
||||
"properties_physics_cloth",
|
||||
"properties_physics_common",
|
||||
"properties_physics_dynamicpaint",
|
||||
|
||||
@@ -673,40 +673,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
|
||||
col = split.column()
|
||||
|
||||
def PARTICLE_INSTANCE(self, layout, ob, md):
|
||||
layout.prop(md, "object")
|
||||
layout.prop(md, "particle_system_index", text="Particle System")
|
||||
|
||||
split = layout.split()
|
||||
col = split.column()
|
||||
col.label(text="Create From:")
|
||||
col.prop(md, "use_normal")
|
||||
col.prop(md, "use_children")
|
||||
col.prop(md, "use_size")
|
||||
|
||||
col = split.column()
|
||||
col.label(text="Show Particles When:")
|
||||
col.prop(md, "show_alive")
|
||||
col.prop(md, "show_unborn")
|
||||
col.prop(md, "show_dead")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.prop(md, "use_path", text="Create Along Paths")
|
||||
|
||||
split = layout.split()
|
||||
split.active = md.use_path
|
||||
col = split.column()
|
||||
col.row().prop(md, "axis", expand=True)
|
||||
col.prop(md, "use_preserve_shape")
|
||||
|
||||
col = split.column()
|
||||
col.prop(md, "position", slider=True)
|
||||
col.prop(md, "random_position", text="Random", slider=True)
|
||||
|
||||
def PARTICLE_SYSTEM(self, layout, ob, md):
|
||||
layout.label(text="Settings can be found inside the Particle context")
|
||||
|
||||
def SCREW(self, layout, ob, md):
|
||||
split = layout.split()
|
||||
|
||||
|
||||
@@ -40,8 +40,6 @@ class UnifiedPaintPanel:
|
||||
return toolsettings.image_paint
|
||||
|
||||
return None
|
||||
elif context.particle_edit_object:
|
||||
return toolsettings.particle_edit
|
||||
|
||||
return None
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -97,7 +97,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
|
||||
'CONSTRAINT') # RB_TODO needs better icon
|
||||
|
||||
|
||||
# cache-type can be 'PSYS' 'HAIR' 'SMOKE' etc
|
||||
# cache-type can be 'CLOTH', 'SMOKE' etc
|
||||
|
||||
def point_cache_ui(self, context, cache, enabled, cachetype):
|
||||
layout = self.layout
|
||||
@@ -113,11 +113,9 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
|
||||
col.operator("ptcache.remove", icon='ZOOMOUT', text="")
|
||||
|
||||
row = layout.row()
|
||||
if cachetype in {'PSYS', 'HAIR', 'SMOKE'}:
|
||||
if cachetype == 'SMOKE':
|
||||
row.prop(cache, "use_external")
|
||||
|
||||
if cachetype == 'SMOKE':
|
||||
row.prop(cache, "use_library_path", "Use Lib Path")
|
||||
row.prop(cache, "use_library_path", "Use Lib Path")
|
||||
|
||||
if cache.use_external:
|
||||
split = layout.split(percentage=0.35)
|
||||
@@ -141,7 +139,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
|
||||
if not cache.use_external or cachetype == 'SMOKE':
|
||||
row = layout.row(align=True)
|
||||
|
||||
if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}:
|
||||
if cachetype != 'DYNAMIC_PAINT':
|
||||
row.enabled = enabled
|
||||
row.prop(cache, "frame_start")
|
||||
row.prop(cache, "frame_end")
|
||||
|
||||
@@ -124,10 +124,8 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, Panel):
|
||||
|
||||
col = split.column()
|
||||
if not use_shading_nodes:
|
||||
sub = col.column()
|
||||
sub.active = (brush.paint_source != 'PARTICLE_SYSTEM')
|
||||
sub.prop(brush, "use_material")
|
||||
if brush.use_material and brush.paint_source != 'PARTICLE_SYSTEM' and not use_shading_nodes:
|
||||
col.prop(brush, "use_material")
|
||||
if brush.use_material and not use_shading_nodes:
|
||||
col.prop(brush, "material", text="")
|
||||
col.prop(brush, "paint_alpha", text="Alpha Factor")
|
||||
else:
|
||||
@@ -429,16 +427,6 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel):
|
||||
col = split.column()
|
||||
col.prop(brush, "paint_source")
|
||||
|
||||
if brush.paint_source == 'PARTICLE_SYSTEM':
|
||||
col.prop_search(brush, "particle_system", ob, "particle_systems", text="")
|
||||
if brush.particle_system:
|
||||
col.label(text="Particle effect:")
|
||||
sub = col.column()
|
||||
sub.active = not brush.use_particle_radius
|
||||
sub.prop(brush, "solid_radius", text="Solid Radius")
|
||||
col.prop(brush, "use_particle_radius", text="Use Particle's Radius")
|
||||
col.prop(brush, "smooth_radius", text="Smooth radius")
|
||||
|
||||
if brush.paint_source in {'DISTANCE', 'VOLUME_DISTANCE', 'POINT'}:
|
||||
col.prop(brush, "paint_distance", text="Paint Distance")
|
||||
split = layout.row().split(percentage=0.4)
|
||||
|
||||
@@ -86,14 +86,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
|
||||
col = split.column()
|
||||
col.label(text="Flow Source:")
|
||||
col.prop(flow, "smoke_flow_source", expand=False, text="")
|
||||
if flow.smoke_flow_source == 'PARTICLES':
|
||||
col.label(text="Particle System:")
|
||||
col.prop_search(flow, "particle_system", ob, "particle_systems", text="")
|
||||
col.prop(flow, "use_particle_size", text="Set Size")
|
||||
sub = col.column()
|
||||
sub.active = flow.use_particle_size
|
||||
sub.prop(flow, "particle_size")
|
||||
else:
|
||||
if flow.smoke_flow_source == 'MESH':
|
||||
col.prop(flow, "surface_distance")
|
||||
col.prop(flow, "volume_density")
|
||||
|
||||
|
||||
@@ -427,12 +427,10 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel):
|
||||
col = split.column()
|
||||
col.label(text="Viewport:")
|
||||
col.prop(rd, "simplify_subdivision", text="Subdivision")
|
||||
col.prop(rd, "simplify_child_particles", text="Child Particles")
|
||||
|
||||
col = split.column()
|
||||
col.label(text="Render:")
|
||||
col.prop(rd, "simplify_subdivision_render", text="Subdivision")
|
||||
col.prop(rd, "simplify_child_particles_render", text="Child Particles")
|
||||
col.prop(rd, "simplify_shadow_samples", text="Shadow Samples")
|
||||
col.prop(rd, "simplify_ao_sss", text="AO and SSS")
|
||||
col.prop(rd, "use_simplify_triangulate")
|
||||
|
||||
@@ -26,7 +26,6 @@ from bpy.types import (
|
||||
Lamp,
|
||||
Material,
|
||||
Object,
|
||||
ParticleSettings,
|
||||
Texture,
|
||||
World,
|
||||
)
|
||||
@@ -101,9 +100,6 @@ def context_tex_datablock(context):
|
||||
if idblock:
|
||||
return idblock
|
||||
|
||||
if context.particle_system:
|
||||
idblock = context.particle_system.settings
|
||||
|
||||
return idblock
|
||||
|
||||
|
||||
@@ -142,8 +138,6 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel):
|
||||
context.lamp or
|
||||
context.texture or
|
||||
context.line_style or
|
||||
context.particle_system or
|
||||
isinstance(context.space_data.pin_id, ParticleSettings) or
|
||||
context.texture_user) and
|
||||
(engine in cls.COMPAT_ENGINES))
|
||||
|
||||
@@ -811,18 +805,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
if pd.point_source == 'PARTICLE_SYSTEM':
|
||||
col.label(text="Object:")
|
||||
col.prop(pd, "object", text="")
|
||||
|
||||
sub = col.column()
|
||||
sub.enabled = bool(pd.object)
|
||||
if pd.object:
|
||||
sub.label(text="System:")
|
||||
sub.prop_search(pd, "particle_system", pd.object, "particle_systems", text="")
|
||||
sub.label(text="Cache:")
|
||||
sub.prop(pd, "particle_cache_space", text="")
|
||||
else:
|
||||
if pd.point_source == 'OBJECT':
|
||||
col.label(text="Object:")
|
||||
col.prop(pd, "object", text="")
|
||||
col.label(text="Cache:")
|
||||
@@ -831,13 +814,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
|
||||
col.separator()
|
||||
|
||||
col.label(text="Color Source:")
|
||||
if pd.point_source == 'PARTICLE_SYSTEM':
|
||||
col.prop(pd, "particle_color_source", text="")
|
||||
if pd.particle_color_source in {'PARTICLE_SPEED', 'PARTICLE_VELOCITY'}:
|
||||
col.prop(pd, "speed_scale")
|
||||
if pd.particle_color_source in {'PARTICLE_SPEED', 'PARTICLE_AGE'}:
|
||||
layout.template_color_ramp(pd, "color_ramp", expand=True)
|
||||
else:
|
||||
if pd.point_source == 'OBJECT':
|
||||
col.prop(pd, "vertex_color_source", text="")
|
||||
if pd.vertex_color_source == 'VERTEX_COLOR':
|
||||
if pd.object and pd.object.data:
|
||||
@@ -854,8 +831,6 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, Panel):
|
||||
col.prop(pd, "falloff", text="")
|
||||
if pd.falloff == 'SOFT':
|
||||
col.prop(pd, "falloff_soft")
|
||||
if pd.falloff == 'PARTICLE_VELOCITY':
|
||||
col.prop(pd, "falloff_speed_scale")
|
||||
|
||||
col.prop(pd, "use_falloff_curve")
|
||||
|
||||
@@ -1147,35 +1122,6 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
|
||||
col = split.column()
|
||||
factor_but(col, "use_map_zenith_up", "zenith_up_factor", "Zenith Up")
|
||||
factor_but(col, "use_map_zenith_down", "zenith_down_factor", "Zenith Down")
|
||||
elif isinstance(idblock, ParticleSettings):
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
col.label(text="General:")
|
||||
factor_but(col, "use_map_time", "time_factor", "Time")
|
||||
factor_but(col, "use_map_life", "life_factor", "Lifetime")
|
||||
factor_but(col, "use_map_density", "density_factor", "Density")
|
||||
factor_but(col, "use_map_size", "size_factor", "Size")
|
||||
|
||||
col = split.column()
|
||||
col.label(text="Physics:")
|
||||
factor_but(col, "use_map_velocity", "velocity_factor", "Velocity")
|
||||
factor_but(col, "use_map_damp", "damp_factor", "Damp")
|
||||
factor_but(col, "use_map_gravity", "gravity_factor", "Gravity")
|
||||
factor_but(col, "use_map_field", "field_factor", "Force Fields")
|
||||
|
||||
layout.label(text="Hair:")
|
||||
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
factor_but(col, "use_map_length", "length_factor", "Length")
|
||||
factor_but(col, "use_map_clump", "clump_factor", "Clump")
|
||||
|
||||
col = split.column()
|
||||
factor_but(col, "use_map_kink_amp", "kink_amp_factor", "Kink Amplitude")
|
||||
factor_but(col, "use_map_kink_freq", "kink_freq_factor", "Kink Frequency")
|
||||
factor_but(col, "use_map_rough", "rough_factor", "Rough")
|
||||
|
||||
elif isinstance(idblock, FreestyleLineStyle):
|
||||
split = layout.split()
|
||||
@@ -1187,18 +1133,17 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
|
||||
|
||||
layout.separator()
|
||||
|
||||
if not isinstance(idblock, ParticleSettings):
|
||||
split = layout.split()
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
col.prop(tex, "blend_type", text="Blend")
|
||||
col.prop(tex, "use_rgb_to_intensity")
|
||||
# color is used on gray-scale textures even when use_rgb_to_intensity is disabled.
|
||||
col.prop(tex, "color", text="")
|
||||
col = split.column()
|
||||
col.prop(tex, "blend_type", text="Blend")
|
||||
col.prop(tex, "use_rgb_to_intensity")
|
||||
# color is used on gray-scale textures even when use_rgb_to_intensity is disabled.
|
||||
col.prop(tex, "color", text="")
|
||||
|
||||
col = split.column()
|
||||
col.prop(tex, "invert", text="Negative")
|
||||
col.prop(tex, "use_stencil")
|
||||
col = split.column()
|
||||
col.prop(tex, "invert", text="Negative")
|
||||
col.prop(tex, "use_stencil")
|
||||
|
||||
if isinstance(idblock, Material) or isinstance(idblock, World):
|
||||
col.prop(tex, "default_value", text="DVar", slider=True)
|
||||
|
||||
@@ -92,8 +92,6 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
|
||||
row.prop(dopesheet, "show_lattices", text="")
|
||||
if bpy.data.armatures:
|
||||
row.prop(dopesheet, "show_armatures", text="")
|
||||
if bpy.data.particles:
|
||||
row.prop(dopesheet, "show_particles", text="")
|
||||
if bpy.data.speakers:
|
||||
row.prop(dopesheet, "show_speakers", text="")
|
||||
if bpy.data.linestyles:
|
||||
|
||||
@@ -167,7 +167,6 @@ class TIME_MT_cache(Menu):
|
||||
col = layout.column()
|
||||
col.enabled = st.show_cache
|
||||
col.prop(st, "cache_softbody")
|
||||
col.prop(st, "cache_particles")
|
||||
col.prop(st, "cache_cloth")
|
||||
col.prop(st, "cache_smoke")
|
||||
col.prop(st, "cache_dynamicpaint")
|
||||
|
||||
@@ -371,7 +371,6 @@ class USERPREF_PT_edit(Panel):
|
||||
col.prop(edit, "use_duplicate_texture", text="Texture")
|
||||
#col.prop(edit, "use_duplicate_fcurve", text="F-Curve")
|
||||
col.prop(edit, "use_duplicate_action", text="Action")
|
||||
col.prop(edit, "use_duplicate_particle", text="Particle")
|
||||
|
||||
|
||||
class USERPREF_PT_system(Panel):
|
||||
|
||||
@@ -47,12 +47,9 @@ class VIEW3D_HT_header(Header):
|
||||
|
||||
if obj:
|
||||
mode = obj.mode
|
||||
# Particle edit
|
||||
if mode == 'PARTICLE_EDIT':
|
||||
row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
|
||||
|
||||
# Occlude geometry
|
||||
if ((view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (mode == 'PARTICLE_EDIT' or (mode == 'EDIT' and obj.type == 'MESH'))) or
|
||||
if ((view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (mode == 'EDIT' and obj.type == 'MESH')) or
|
||||
(mode == 'WEIGHT_PAINT')):
|
||||
row.prop(view, "use_occlude_geometry", text="")
|
||||
|
||||
@@ -62,7 +59,7 @@ class VIEW3D_HT_header(Header):
|
||||
row.prop(toolsettings, "proportional_edit", icon_only=True)
|
||||
if toolsettings.proportional_edit != 'DISABLED':
|
||||
row.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
|
||||
elif mode in {'EDIT', 'PARTICLE_EDIT'}:
|
||||
elif mode == 'EDIT':
|
||||
row = layout.row(align=True)
|
||||
row.prop(toolsettings, "proportional_edit", icon_only=True)
|
||||
if toolsettings.proportional_edit != 'DISABLED':
|
||||
@@ -675,35 +672,6 @@ class VIEW3D_MT_select_pose(Menu):
|
||||
layout.operator("object.select_pattern", text="Select Pattern...")
|
||||
|
||||
|
||||
class VIEW3D_MT_select_particle(Menu):
|
||||
bl_label = "Select"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
layout.operator("view3d.select_border")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_all").action = 'TOGGLE'
|
||||
layout.operator("particle.select_linked")
|
||||
layout.operator("particle.select_all", text="Inverse").action = 'INVERT'
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_more")
|
||||
layout.operator("particle.select_less")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_random")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_roots", text="Roots")
|
||||
layout.operator("particle.select_tips", text="Tips")
|
||||
|
||||
|
||||
class VIEW3D_MT_edit_mesh_select_similar(Menu):
|
||||
bl_label = "Select Similar"
|
||||
|
||||
@@ -1874,85 +1842,6 @@ class VIEW3D_MT_hide_mask(Menu):
|
||||
props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask")
|
||||
|
||||
|
||||
# ********** Particle menu **********
|
||||
|
||||
|
||||
class VIEW3D_MT_particle(Menu):
|
||||
bl_label = "Particle"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
particle_edit = context.tool_settings.particle_edit
|
||||
|
||||
layout.operator("ed.undo")
|
||||
layout.operator("ed.redo")
|
||||
layout.operator("ed.undo_history")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.mirror")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.remove_doubles")
|
||||
layout.operator("particle.delete")
|
||||
|
||||
if particle_edit.select_mode == 'POINT':
|
||||
layout.operator("particle.subdivide")
|
||||
|
||||
layout.operator("particle.rekey")
|
||||
layout.operator("particle.weight_set")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.menu("VIEW3D_MT_particle_showhide")
|
||||
|
||||
|
||||
class VIEW3D_MT_particle_specials(Menu):
|
||||
bl_label = "Specials"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
particle_edit = context.tool_settings.particle_edit
|
||||
|
||||
layout.operator("particle.rekey")
|
||||
layout.operator("particle.delete")
|
||||
layout.operator("particle.remove_doubles")
|
||||
|
||||
if particle_edit.select_mode == 'POINT':
|
||||
layout.operator("particle.subdivide")
|
||||
|
||||
layout.operator("particle.weight_set")
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.mirror")
|
||||
|
||||
if particle_edit.select_mode == 'POINT':
|
||||
layout.separator()
|
||||
layout.operator("particle.select_roots")
|
||||
layout.operator("particle.select_tips")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_random")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_more")
|
||||
layout.operator("particle.select_less")
|
||||
|
||||
layout.separator()
|
||||
|
||||
layout.operator("particle.select_all").action = 'TOGGLE'
|
||||
layout.operator("particle.select_linked")
|
||||
layout.operator("particle.select_all", text="Inverse").action = 'INVERT'
|
||||
|
||||
|
||||
class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu):
|
||||
_operator_name = "particle"
|
||||
|
||||
# ********** Pose Menu **********
|
||||
|
||||
|
||||
|
||||
@@ -881,37 +881,12 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
|
||||
settings = self.paint_settings(context)
|
||||
brush = settings.brush
|
||||
|
||||
if not context.particle_edit_object:
|
||||
col = layout.split().column()
|
||||
col.template_ID_preview(settings, "brush", new="brush.add", rows=3, cols=8)
|
||||
|
||||
# Particle Mode #
|
||||
if context.particle_edit_object:
|
||||
tool = settings.tool
|
||||
|
||||
layout.column().prop(settings, "tool", expand=True)
|
||||
|
||||
if tool != 'NONE':
|
||||
col = layout.column()
|
||||
col.prop(brush, "size", slider=True)
|
||||
if tool != 'ADD':
|
||||
col.prop(brush, "strength", slider=True)
|
||||
|
||||
if tool == 'ADD':
|
||||
col.prop(brush, "count")
|
||||
col = layout.column()
|
||||
col.prop(settings, "use_default_interpolate")
|
||||
col.prop(brush, "steps", slider=True)
|
||||
col.prop(settings, "default_key_count", slider=True)
|
||||
elif tool == 'LENGTH':
|
||||
layout.prop(brush, "length_mode", expand=True)
|
||||
elif tool == 'PUFF':
|
||||
layout.prop(brush, "puff_mode", expand=True)
|
||||
layout.prop(brush, "use_puff_volume")
|
||||
col = layout.split().column()
|
||||
col.template_ID_preview(settings, "brush", new="brush.add", rows=3, cols=8)
|
||||
|
||||
# Sculpt Mode #
|
||||
|
||||
elif context.sculpt_object and brush:
|
||||
if context.sculpt_object and brush:
|
||||
capabilities = brush.sculpt_capabilities
|
||||
|
||||
col = layout.column()
|
||||
@@ -1592,7 +1567,7 @@ class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel):
|
||||
@classmethod
|
||||
def poll(cls, context):
|
||||
settings = cls.paint_settings(context)
|
||||
return (settings is not None) and (not isinstance(settings, bpy.types.ParticleEdit))
|
||||
return (settings is not None)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
@@ -1815,78 +1790,6 @@ class VIEW3D_MT_tools_projectpaint_stencil(Menu):
|
||||
props.value = i
|
||||
|
||||
|
||||
class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
|
||||
"""Default tools for particle mode"""
|
||||
bl_context = "particlemode"
|
||||
bl_label = "Options"
|
||||
bl_category = "Tools"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
|
||||
pe = context.tool_settings.particle_edit
|
||||
ob = pe.object
|
||||
|
||||
layout.prop(pe, "type", text="")
|
||||
|
||||
ptcache = None
|
||||
|
||||
if pe.type == 'PARTICLES':
|
||||
if ob.particle_systems:
|
||||
if len(ob.particle_systems) > 1:
|
||||
layout.template_list("UI_UL_list", "particle_systems", ob, "particle_systems",
|
||||
ob.particle_systems, "active_index", rows=2, maxrows=3)
|
||||
|
||||
ptcache = ob.particle_systems.active.point_cache
|
||||
else:
|
||||
for md in ob.modifiers:
|
||||
if md.type == pe.type:
|
||||
ptcache = md.point_cache
|
||||
|
||||
if ptcache and len(ptcache.point_caches) > 1:
|
||||
layout.template_list("UI_UL_list", "particles_point_caches", ptcache, "point_caches",
|
||||
ptcache.point_caches, "active_index", rows=2, maxrows=3)
|
||||
|
||||
if not pe.is_editable:
|
||||
layout.label(text="Point cache must be baked")
|
||||
layout.label(text="in memory to enable editing!")
|
||||
|
||||
col = layout.column(align=True)
|
||||
if pe.is_hair:
|
||||
col.active = pe.is_editable
|
||||
col.prop(pe, "use_emitter_deflect", text="Deflect emitter")
|
||||
sub = col.row(align=True)
|
||||
sub.active = pe.use_emitter_deflect
|
||||
sub.prop(pe, "emitter_distance", text="Distance")
|
||||
|
||||
col = layout.column(align=True)
|
||||
col.active = pe.is_editable
|
||||
col.label(text="Keep:")
|
||||
col.prop(pe, "use_preserve_length", text="Lengths")
|
||||
col.prop(pe, "use_preserve_root", text="Root")
|
||||
if not pe.is_hair:
|
||||
col.label(text="Correct:")
|
||||
col.prop(pe, "use_auto_velocity", text="Velocity")
|
||||
col.prop(ob.data, "use_mirror_x")
|
||||
|
||||
col.prop(pe, "shape_object")
|
||||
col.operator("particle.shape_cut")
|
||||
|
||||
col = layout.column(align=True)
|
||||
col.active = pe.is_editable
|
||||
col.label(text="Draw:")
|
||||
col.prop(pe, "draw_step", text="Path Steps")
|
||||
if pe.is_hair:
|
||||
col.prop(pe, "show_particles", text="Children")
|
||||
else:
|
||||
if pe.type == 'PARTICLES':
|
||||
col.prop(pe, "show_particles", text="Particles")
|
||||
col.prop(pe, "use_fade_time")
|
||||
sub = col.row(align=True)
|
||||
sub.active = pe.use_fade_time
|
||||
sub.prop(pe, "fade_frames", slider=True)
|
||||
|
||||
|
||||
# Grease Pencil drawing tools
|
||||
class VIEW3D_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel):
|
||||
bl_space_type = 'VIEW_3D'
|
||||
|
||||
Reference in New Issue
Block a user