nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +5 -11
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f4edf8c2a - Show all commits

1
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@ -485,7 +485,6 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
obj = context.object
me = context.mesh me = context.mesh
col = layout.column() col = layout.column()

9
release/scripts/startup/bl_ui/properties_particle.py
View File

@ -62,7 +62,6 @@ class PARTICLE_MT_context_menu(Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
psys = context.particle_system psys = context.particle_system
experimental = context.preferences.experimental
props = layout.operator( props = layout.operator(
"particle.copy_particle_systems", "particle.copy_particle_systems",
@ -508,7 +507,7 @@ class PARTICLE_PT_hair_dynamics_structure(ParticleButtonsPanel, Panel):
sub.prop(psys.settings, "bending_random", text="Random") sub.prop(psys.settings, "bending_random", text="Random")
col.prop(cloth, "bending_damping", text="Damping") col.prop(cloth, "bending_damping", text="Damping")
# XXX has no noticeable effect with stiff hair structure springs # XXX has no noticeable effect with stiff hair structure springs
#col.prop(cloth, "spring_damping", text="Damping") # col.prop(cloth, "spring_damping", text="Damping")
class PARTICLE_PT_hair_dynamics_volume(ParticleButtonsPanel, Panel): class PARTICLE_PT_hair_dynamics_volume(ParticleButtonsPanel, Panel):
@ -1100,7 +1099,7 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel):
if part.physics_type == 'KEYED': if part.physics_type == 'KEYED':
col = layout.column() col = layout.column()
# doesn't work yet # doesn't work yet
#col.alert = key.valid # col.alert = key.valid
col.prop(key, "object") col.prop(key, "object")
col.prop(key, "system", text="System") col.prop(key, "system", text="System")
sub = col.column(align=True) sub = col.column(align=True)
@ -1110,7 +1109,7 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel):
elif part.physics_type == 'BOIDS': elif part.physics_type == 'BOIDS':
sub = layout.column() sub = layout.column()
# doesn't work yet # doesn't work yet
#sub.alert = key.valid # sub.alert = key.valid
sub.prop(key, "object") sub.prop(key, "object")
sub.prop(key, "system", text="System") sub.prop(key, "system", text="System")
layout.prop(key, "alliance") layout.prop(key, "alliance")
@ -1157,7 +1156,7 @@ class PARTICLE_PT_physics_fluid_interaction(ParticleButtonsPanel, Panel):
if key: if key:
sub = layout.column() sub = layout.column()
# doesn't work yet # doesn't work yet
#sub.alert = key.valid # sub.alert = key.valid
sub.prop(key, "object") sub.prop(key, "object")
sub.prop(key, "system", text="System") sub.prop(key, "system", text="System")

1
release/scripts/startup/bl_ui/properties_render.py
View File

@ -641,7 +641,6 @@ class RENDER_PT_eevee_next_film(RenderButtonsPanel, Panel):
scene = context.scene scene = context.scene
rd = scene.render rd = scene.render
props = scene.eevee
col = layout.column() col = layout.column()
col.prop(rd, "filter_size") col.prop(rd, "filter_size")

3
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -6707,13 +6707,12 @@ class VIEW3D_PT_overlay_sculpt(Panel):
def poll(cls, context): def poll(cls, context):
return ( return (
context.mode == 'SCULPT' and context.mode == 'SCULPT' and
(context.sculpt_object and context.tool_settings.sculpt) context.sculpt_object
) )
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
tool_settings = context.tool_settings tool_settings = context.tool_settings
sculpt = tool_settings.sculpt
view = context.space_data view = context.space_data
overlay = view.overlay overlay = view.overlay

2
tests/python/bl_rna_manual_reference.py
View File

@ -74,8 +74,6 @@ def test_lookup_coverage():
print("----------------------------------") print("----------------------------------")
print("RNA Patterns Unknown to the Manual") print("RNA Patterns Unknown to the Manual")
unknown_rna_list = []
for rna_group, rna_id in rna_ids(): for rna_group, rna_id in rna_ids():
# Correct but slower & doesn't track usage. # Correct but slower & doesn't track usage.
# url = wm.WM_OT_doc_view_manual._lookup_rna_url(rna_id, verbose=False) # url = wm.WM_OT_doc_view_manual._lookup_rna_url(rna_id, verbose=False)