From 19d493ee10987a049df2b1d6d06d6d9054e35469 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 20 Mar 2017 02:34:32 +1100 Subject: Moving classes to separate listing broke panel order Although this wasn't so obvious since it only showed up for factory settings and in the preferences window. Panel display order depends on registration order, Sorry for the noise. On the bright side we no longer need to move classes around to re-arrange panels. --- .../scripts/startup/bl_ui/properties_constraint.py | 2 +- .../startup/bl_ui/properties_data_armature.py | 10 +- .../scripts/startup/bl_ui/properties_data_bone.py | 10 +- .../startup/bl_ui/properties_data_camera.py | 10 +- .../scripts/startup/bl_ui/properties_data_curve.py | 10 +- .../scripts/startup/bl_ui/properties_data_lamp.py | 12 +- .../startup/bl_ui/properties_data_lattice.py | 2 +- .../scripts/startup/bl_ui/properties_data_mesh.py | 18 +- .../startup/bl_ui/properties_data_metaball.py | 4 +- .../startup/bl_ui/properties_data_speaker.py | 6 +- .../scripts/startup/bl_ui/properties_freestyle.py | 8 +- release/scripts/startup/bl_ui/properties_game.py | 18 +- .../bl_ui/properties_grease_pencil_common.py | 16 +- .../startup/bl_ui/properties_mask_common.py | 8 +- .../scripts/startup/bl_ui/properties_material.py | 32 ++-- release/scripts/startup/bl_ui/properties_object.py | 14 +- .../scripts/startup/bl_ui/properties_particle.py | 22 +-- .../bl_ui/properties_physics_dynamicpaint.py | 12 +- .../startup/bl_ui/properties_physics_field.py | 2 +- .../startup/bl_ui/properties_physics_fluid.py | 4 +- .../startup/bl_ui/properties_physics_smoke.py | 10 +- .../startup/bl_ui/properties_physics_softbody.py | 6 +- release/scripts/startup/bl_ui/properties_render.py | 14 +- .../startup/bl_ui/properties_render_layer.py | 6 +- release/scripts/startup/bl_ui/properties_scene.py | 16 +- .../scripts/startup/bl_ui/properties_texture.py | 40 ++-- release/scripts/startup/bl_ui/properties_world.py | 10 +- release/scripts/startup/bl_ui/space_clip.py | 94 ++++----- release/scripts/startup/bl_ui/space_console.py | 2 +- release/scripts/startup/bl_ui/space_dopesheet.py | 14 +- release/scripts/startup/bl_ui/space_filebrowser.py | 8 +- release/scripts/startup/bl_ui/space_graph.py | 10 +- release/scripts/startup/bl_ui/space_image.py | 64 +++---- release/scripts/startup/bl_ui/space_info.py | 6 +- release/scripts/startup/bl_ui/space_logic.py | 4 +- release/scripts/startup/bl_ui/space_nla.py | 8 +- release/scripts/startup/bl_ui/space_node.py | 16 +- release/scripts/startup/bl_ui/space_outliner.py | 4 +- release/scripts/startup/bl_ui/space_sequencer.py | 32 ++-- release/scripts/startup/bl_ui/space_text.py | 16 +- release/scripts/startup/bl_ui/space_time.py | 8 +- release/scripts/startup/bl_ui/space_userpref.py | 20 +- release/scripts/startup/bl_ui/space_view3d.py | 212 ++++++++++----------- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 94 ++++----- 44 files changed, 467 insertions(+), 467 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 8a080d855ba..00892d5f85b 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -942,8 +942,8 @@ class BONE_PT_constraints(ConstraintButtonsPanel, Panel): self.draw_constraint(context, con) classes = ( - BONE_PT_constraints, OBJECT_PT_constraints, + BONE_PT_constraints, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 48ec160c232..a2ecf984eb5 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -330,16 +330,16 @@ class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel): classes = ( - DATA_PT_bone_group_specials, - DATA_PT_bone_groups, DATA_PT_context_arm, - DATA_PT_custom_props_arm, + DATA_PT_skeleton, DATA_PT_display, + DATA_PT_bone_group_specials, + DATA_PT_bone_groups, + DATA_PT_pose_library, DATA_PT_ghost, DATA_PT_iksolver_itasc, DATA_PT_motion_paths, - DATA_PT_pose_library, - DATA_PT_skeleton, + DATA_PT_custom_props_arm, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index 75e828e5a02..132c355ed99 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -452,14 +452,14 @@ class BONE_PT_custom_props(BoneButtonsPanel, PropertyPanel, Panel): classes = ( BONE_PT_context_bone, + BONE_PT_transform, + BONE_PT_transform_locks, BONE_PT_curved, - BONE_PT_custom_props, - BONE_PT_deform, + BONE_PT_relations, BONE_PT_display, BONE_PT_inverse_kinematics, - BONE_PT_relations, - BONE_PT_transform, - BONE_PT_transform_locks, + BONE_PT_deform, + BONE_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 177012dec32..101062095c4 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -327,15 +327,15 @@ def draw_display_safe_settings(layout, safe_data, settings): classes = ( CAMERA_MT_presets, + SAFE_AREAS_MT_presets, + DATA_PT_context_camera, + DATA_PT_lens, DATA_PT_camera, - DATA_PT_camera_display, + DATA_PT_camera_stereoscopy, DATA_PT_camera_dof, + DATA_PT_camera_display, DATA_PT_camera_safe_areas, - DATA_PT_camera_stereoscopy, - DATA_PT_context_camera, DATA_PT_custom_props_camera, - DATA_PT_lens, - SAFE_AREAS_MT_presets, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 9c8a4a90f33..ac1eb9505a6 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -433,16 +433,16 @@ class DATA_PT_custom_props_curve(CurveButtonsPanel, PropertyPanel, Panel): classes = ( - DATA_PT_active_spline, DATA_PT_context_curve, + DATA_PT_shape_curve, DATA_PT_curve_texture_space, - DATA_PT_custom_props_curve, - DATA_PT_font, DATA_PT_geometry_curve, - DATA_PT_paragraph, DATA_PT_pathanim, - DATA_PT_shape_curve, + DATA_PT_active_spline, + DATA_PT_font, + DATA_PT_paragraph, DATA_PT_text_boxes, + DATA_PT_custom_props_curve, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py index 2213781c7d9..f913ef51381 100644 --- a/release/scripts/startup/bl_ui/properties_data_lamp.py +++ b/release/scripts/startup/bl_ui/properties_data_lamp.py @@ -396,16 +396,16 @@ class DATA_PT_custom_props_lamp(DataButtonsPanel, PropertyPanel, Panel): classes = ( - DATA_PT_area, + LAMP_MT_sunsky_presets, DATA_PT_context_lamp, - DATA_PT_custom_props_lamp, - DATA_PT_falloff_curve, - DATA_PT_lamp, DATA_PT_preview, + DATA_PT_lamp, + DATA_PT_sunsky, DATA_PT_shadow, + DATA_PT_area, DATA_PT_spot, - DATA_PT_sunsky, - LAMP_MT_sunsky_presets, + DATA_PT_falloff_curve, + DATA_PT_custom_props_lamp, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_lattice.py b/release/scripts/startup/bl_ui/properties_data_lattice.py index 7f0294cdd20..4b3fd48c195 100644 --- a/release/scripts/startup/bl_ui/properties_data_lattice.py +++ b/release/scripts/startup/bl_ui/properties_data_lattice.py @@ -85,8 +85,8 @@ class DATA_PT_custom_props_lattice(DataButtonsPanel, PropertyPanel, Panel): classes = ( DATA_PT_context_lattice, - DATA_PT_custom_props_lattice, DATA_PT_lattice, + DATA_PT_custom_props_lattice, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 8647d5d6644..de55b4152ba 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -393,20 +393,20 @@ class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, Panel): classes = ( + MESH_MT_vertex_group_specials, + MESH_MT_shape_key_specials, + MESH_UL_vgroups, + MESH_UL_shape_keys, + MESH_UL_uvmaps_vcols, DATA_PT_context_mesh, - DATA_PT_custom_props_mesh, - DATA_PT_customdata, DATA_PT_normals, - DATA_PT_shape_keys, DATA_PT_texture_space, + DATA_PT_vertex_groups, + DATA_PT_shape_keys, DATA_PT_uv_texture, DATA_PT_vertex_colors, - DATA_PT_vertex_groups, - MESH_MT_shape_key_specials, - MESH_MT_vertex_group_specials, - MESH_UL_shape_keys, - MESH_UL_uvmaps_vcols, - MESH_UL_vgroups, + DATA_PT_customdata, + DATA_PT_custom_props_mesh, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index 239d16ed77c..a621dc7210f 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -138,10 +138,10 @@ class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel, Panel): classes = ( DATA_PT_context_metaball, - DATA_PT_custom_props_metaball, - DATA_PT_mball_texture_space, DATA_PT_metaball, + DATA_PT_mball_texture_space, DATA_PT_metaball_element, + DATA_PT_custom_props_metaball, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_data_speaker.py b/release/scripts/startup/bl_ui/properties_data_speaker.py index 3f30e214f24..eecb2690302 100644 --- a/release/scripts/startup/bl_ui/properties_data_speaker.py +++ b/release/scripts/startup/bl_ui/properties_data_speaker.py @@ -123,11 +123,11 @@ class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, Panel): classes = ( - DATA_PT_cone, DATA_PT_context_speaker, - DATA_PT_custom_props_speaker, - DATA_PT_distance, DATA_PT_speaker, + DATA_PT_distance, + DATA_PT_cone, + DATA_PT_custom_props_speaker, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 89024a52c25..9c5be7624e0 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -829,13 +829,13 @@ class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel): classes = ( - MATERIAL_PT_freestyle_line, + RENDER_PT_freestyle, + RENDERLAYER_UL_linesets, + RENDER_MT_lineset_specials, RENDERLAYER_PT_freestyle, RENDERLAYER_PT_freestyle_lineset, RENDERLAYER_PT_freestyle_linestyle, - RENDERLAYER_UL_linesets, - RENDER_MT_lineset_specials, - RENDER_PT_freestyle, + MATERIAL_PT_freestyle_line, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 2e309a10940..46b34373aa5 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -853,26 +853,26 @@ class OBJECT_PT_levels_of_detail(ObjectButtonsPanel, Panel): classes = ( - DATA_PT_shadow_game, - OBJECT_MT_lod_tools, - OBJECT_PT_levels_of_detail, + PHYSICS_PT_game_physics, PHYSICS_PT_game_collision_bounds, PHYSICS_PT_game_obstacles, - PHYSICS_PT_game_physics, RENDER_PT_embedded, - RENDER_PT_game_display, RENDER_PT_game_player, - RENDER_PT_game_shading, RENDER_PT_game_stereo, + RENDER_PT_game_shading, RENDER_PT_game_system, - SCENE_PT_game_hysteresis, - SCENE_PT_game_navmesh, + RENDER_PT_game_display, SCENE_PT_game_physics, SCENE_PT_game_physics_obstacles, + SCENE_PT_game_navmesh, + SCENE_PT_game_hysteresis, WORLD_PT_game_context_world, + WORLD_PT_game_world, WORLD_PT_game_environment_lighting, WORLD_PT_game_mist, - WORLD_PT_game_world, + DATA_PT_shadow_game, + OBJECT_MT_lod_tools, + OBJECT_PT_levels_of_detail, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 83c27c1ccfc..42e8d5272b3 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -1158,18 +1158,18 @@ class GreasePencilToolsPanel: classes = ( - GPENCIL_MT_brush_specials, - GPENCIL_MT_gpencil_edit_specials, - GPENCIL_MT_layer_specials, - GPENCIL_MT_palettecolor_specials, - GPENCIL_MT_snap, - GPENCIL_PIE_sculpt, - GPENCIL_PIE_settings_palette, GPENCIL_PIE_tool_palette, + GPENCIL_PIE_settings_palette, GPENCIL_PIE_tools_more, + GPENCIL_PIE_sculpt, + GPENCIL_MT_snap, + GPENCIL_MT_gpencil_edit_specials, GPENCIL_UL_brush, - GPENCIL_UL_layer, GPENCIL_UL_palettecolor, + GPENCIL_UL_layer, + GPENCIL_MT_layer_specials, + GPENCIL_MT_brush_specials, + GPENCIL_MT_palettecolor_specials, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 78fb7843f14..a7a67130f2f 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -394,12 +394,12 @@ class MASK_MT_select(Menu): classes = ( - MASK_MT_animation, + MASK_UL_layers, MASK_MT_mask, - MASK_MT_select, - MASK_MT_transform, MASK_MT_visibility, - MASK_UL_layers, + MASK_MT_transform, + MASK_MT_animation, + MASK_MT_select, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index def272d5045..c384600344e 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -1054,33 +1054,33 @@ class MATERIAL_PT_custom_props(MaterialButtonsPanel, PropertyPanel, Panel): classes = ( - MATERIAL_MT_specials, MATERIAL_MT_sss_presets, + MATERIAL_MT_specials, + MATERIAL_UL_matslots, MATERIAL_PT_context_material, - MATERIAL_PT_custom_props, + MATERIAL_PT_preview, + MATERIAL_PT_pipeline, MATERIAL_PT_diffuse, + MATERIAL_PT_specular, + MATERIAL_PT_shading, + MATERIAL_PT_transp, + MATERIAL_PT_mirror, + MATERIAL_PT_sss, + MATERIAL_PT_halo, MATERIAL_PT_flare, MATERIAL_PT_game_settings, - MATERIAL_PT_halo, - MATERIAL_PT_mirror, - MATERIAL_PT_options, MATERIAL_PT_physics, - MATERIAL_PT_pipeline, - MATERIAL_PT_preview, - MATERIAL_PT_shading, - MATERIAL_PT_shadow, - MATERIAL_PT_specular, - MATERIAL_PT_sss, MATERIAL_PT_strand, - MATERIAL_PT_transp, + MATERIAL_PT_options, + MATERIAL_PT_shadow, MATERIAL_PT_transp_game, MATERIAL_PT_volume_density, - MATERIAL_PT_volume_integration, - MATERIAL_PT_volume_lighting, - MATERIAL_PT_volume_options, MATERIAL_PT_volume_shading, + MATERIAL_PT_volume_lighting, MATERIAL_PT_volume_transp, - MATERIAL_UL_matslots, + MATERIAL_PT_volume_integration, + MATERIAL_PT_volume_options, + MATERIAL_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 099b82e000e..d7e18f81232 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -368,18 +368,18 @@ class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, Panel): classes = ( - GROUP_MT_specials, OBJECT_PT_context_object, - OBJECT_PT_custom_props, + OBJECT_PT_transform, OBJECT_PT_delta_transform, + OBJECT_PT_transform_locks, + OBJECT_PT_relations, + OBJECT_PT_relations_extras, + GROUP_MT_specials, + OBJECT_PT_groups, OBJECT_PT_display, OBJECT_PT_duplication, - OBJECT_PT_groups, OBJECT_PT_motion_paths, - OBJECT_PT_relations, - OBJECT_PT_relations_extras, - OBJECT_PT_transform, - OBJECT_PT_transform_locks, + OBJECT_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index deaf6cd4f37..593312fc071 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1406,24 +1406,24 @@ class PARTICLE_PT_custom_props(ParticleButtonsPanel, PropertyPanel, Panel): classes = ( - PARTICLE_MT_hair_dynamics_presets, PARTICLE_MT_specials, - PARTICLE_PT_boidbrain, - PARTICLE_PT_cache, - PARTICLE_PT_children, + PARTICLE_MT_hair_dynamics_presets, + PARTICLE_UL_particle_systems, PARTICLE_PT_context_particles, - PARTICLE_PT_custom_props, - PARTICLE_PT_draw, PARTICLE_PT_emission, - PARTICLE_PT_field_weights, - PARTICLE_PT_force_fields, PARTICLE_PT_hair_dynamics, + PARTICLE_PT_cache, + PARTICLE_PT_velocity, + PARTICLE_PT_rotation, PARTICLE_PT_physics, + PARTICLE_PT_boidbrain, PARTICLE_PT_render, - PARTICLE_PT_rotation, - PARTICLE_PT_velocity, + PARTICLE_PT_draw, + PARTICLE_PT_children, + PARTICLE_PT_field_weights, + PARTICLE_PT_force_fields, PARTICLE_PT_vertexgroups, - PARTICLE_UL_particle_systems, + PARTICLE_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 4758f72edb5..c813350be08 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -530,16 +530,16 @@ class PHYSICS_PT_dp_brush_wave(PhysicButtonsPanel, Panel): classes = ( + PHYSICS_UL_dynapaint_surfaces, + PHYSICS_PT_dynamic_paint, PHYSICS_PT_dp_advanced_canvas, + PHYSICS_PT_dp_canvas_output, + PHYSICS_PT_dp_canvas_initial_color, + PHYSICS_PT_dp_effects, + PHYSICS_PT_dp_cache, PHYSICS_PT_dp_brush_source, PHYSICS_PT_dp_brush_velocity, PHYSICS_PT_dp_brush_wave, - PHYSICS_PT_dp_cache, - PHYSICS_PT_dp_canvas_initial_color, - PHYSICS_PT_dp_canvas_output, - PHYSICS_PT_dp_effects, - PHYSICS_PT_dynamic_paint, - PHYSICS_UL_dynapaint_surfaces, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index a1c160d4a7e..2b12fcf982d 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -230,8 +230,8 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, Panel): classes = ( - PHYSICS_PT_collision, PHYSICS_PT_field, + PHYSICS_PT_collision, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 6c7fba44988..ab92370f9ae 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -311,10 +311,10 @@ class PHYSICS_PT_domain_particles(PhysicButtonsPanel, Panel): classes = ( FLUID_MT_presets, - PHYSICS_PT_domain_boundary, + PHYSICS_PT_fluid, PHYSICS_PT_domain_gravity, + PHYSICS_PT_domain_boundary, PHYSICS_PT_domain_particles, - PHYSICS_PT_fluid, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 028333a8e3b..e6182c2ec74 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -412,14 +412,14 @@ class PHYSICS_PT_smoke_display_settings(PhysicButtonsPanel, Panel): classes = ( PHYSICS_PT_smoke, + PHYSICS_PT_smoke_flow_advanced, + PHYSICS_PT_smoke_fire, PHYSICS_PT_smoke_adaptive_domain, + PHYSICS_PT_smoke_highres, + PHYSICS_PT_smoke_groups, PHYSICS_PT_smoke_cache, - PHYSICS_PT_smoke_display_settings, PHYSICS_PT_smoke_field_weights, - PHYSICS_PT_smoke_fire, - PHYSICS_PT_smoke_flow_advanced, - PHYSICS_PT_smoke_groups, - PHYSICS_PT_smoke_highres, + PHYSICS_PT_smoke_display_settings, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index f463f56bac0..5960428e4ae 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -248,11 +248,11 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, Panel): classes = ( PHYSICS_PT_softbody, PHYSICS_PT_softbody_cache, - PHYSICS_PT_softbody_collision, - PHYSICS_PT_softbody_edge, - PHYSICS_PT_softbody_field_weights, PHYSICS_PT_softbody_goal, + PHYSICS_PT_softbody_edge, + PHYSICS_PT_softbody_collision, PHYSICS_PT_softbody_solver, + PHYSICS_PT_softbody_field_weights, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index da33b3c560d..a7e8d9273ad 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -585,20 +585,20 @@ class RENDER_PT_bake(RenderButtonsPanel, Panel): classes = ( + RENDER_MT_presets, RENDER_MT_ffmpeg_presets, RENDER_MT_framerate_presets, - RENDER_MT_presets, - RENDER_PT_antialiasing, - RENDER_PT_bake, + RENDER_PT_render, RENDER_PT_dimensions, - RENDER_PT_encoding, + RENDER_PT_antialiasing, RENDER_PT_motion_blur, - RENDER_PT_output, + RENDER_PT_shading, RENDER_PT_performance, RENDER_PT_post_processing, - RENDER_PT_render, - RENDER_PT_shading, RENDER_PT_stamp, + RENDER_PT_output, + RENDER_PT_encoding, + RENDER_PT_bake, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py index 42c1638900c..084bc387822 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_render_layer.py @@ -228,12 +228,12 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel): classes = ( + RENDERLAYER_UL_renderlayers, + RENDERLAYER_PT_layers, RENDERLAYER_PT_layer_options, RENDERLAYER_PT_layer_passes, - RENDERLAYER_PT_layers, - RENDERLAYER_PT_views, - RENDERLAYER_UL_renderlayers, RENDERLAYER_UL_renderviews, + RENDERLAYER_PT_views, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 7268a68a724..fb93c0b56f2 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -446,19 +446,19 @@ class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): classes = ( SCENE_MT_units_length_presets, - SCENE_PT_audio, - SCENE_PT_color_management, - SCENE_PT_custom_props, - SCENE_PT_keying_set_paths, + SCENE_UL_keying_set_paths, + SCENE_PT_scene, + SCENE_PT_unit, SCENE_PT_keying_sets, + SCENE_PT_keying_set_paths, + SCENE_PT_color_management, + SCENE_PT_audio, SCENE_PT_physics, + SCENE_PT_rigid_body_world, SCENE_PT_rigid_body_cache, SCENE_PT_rigid_body_field_weights, - SCENE_PT_rigid_body_world, - SCENE_PT_scene, SCENE_PT_simplify, - SCENE_PT_unit, - SCENE_UL_keying_set_paths, + SCENE_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index c3f160e03d7..caeccb9bb9d 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -1226,33 +1226,33 @@ class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel): classes = ( - TEXTURE_MT_envmap_specials, TEXTURE_MT_specials, - TEXTURE_PT_blend, - TEXTURE_PT_clouds, - TEXTURE_PT_colors, + TEXTURE_MT_envmap_specials, + TEXTURE_UL_texslots, TEXTURE_PT_context_texture, - TEXTURE_PT_custom_props, - TEXTURE_PT_distortednoise, - TEXTURE_PT_envmap, - TEXTURE_PT_envmap_sampling, + TEXTURE_PT_preview, + TEXTURE_PT_colors, + TEXTURE_PT_clouds, + TEXTURE_PT_wood, + TEXTURE_PT_marble, + TEXTURE_PT_magic, + TEXTURE_PT_blend, + TEXTURE_PT_stucci, TEXTURE_PT_image, - TEXTURE_PT_image_mapping, TEXTURE_PT_image_sampling, - TEXTURE_PT_influence, - TEXTURE_PT_magic, - TEXTURE_PT_mapping, - TEXTURE_PT_marble, + TEXTURE_PT_image_mapping, + TEXTURE_PT_envmap, + TEXTURE_PT_envmap_sampling, TEXTURE_PT_musgrave, - TEXTURE_PT_ocean, - TEXTURE_PT_pointdensity, - TEXTURE_PT_pointdensity_turbulence, - TEXTURE_PT_preview, - TEXTURE_PT_stucci, TEXTURE_PT_voronoi, + TEXTURE_PT_distortednoise, TEXTURE_PT_voxeldata, - TEXTURE_PT_wood, - TEXTURE_UL_texslots, + TEXTURE_PT_pointdensity, + TEXTURE_PT_pointdensity_turbulence, + TEXTURE_PT_ocean, + TEXTURE_PT_mapping, + TEXTURE_PT_influence, + TEXTURE_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 16283040c3c..6aa39580d34 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -250,15 +250,15 @@ class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, Panel): classes = ( - WORLD_PT_ambient_occlusion, WORLD_PT_context_world, - WORLD_PT_custom_props, + WORLD_PT_preview, + WORLD_PT_world, + WORLD_PT_ambient_occlusion, WORLD_PT_environment_lighting, - WORLD_PT_gather, WORLD_PT_indirect_lighting, + WORLD_PT_gather, WORLD_PT_mist, - WORLD_PT_preview, - WORLD_PT_world, + WORLD_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 44509b42b6b..3f05620fcf6 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1487,65 +1487,65 @@ class CLIP_MT_stabilize_2d_rotation_specials(Menu): classes = ( + CLIP_UL_tracking_objects, CLIP_HT_header, - CLIP_MT_camera_presets, - CLIP_MT_clip, - CLIP_MT_masking_editor_menus, - CLIP_MT_proxy, - CLIP_MT_reconstruction, - CLIP_MT_select, - CLIP_MT_select_grouped, - CLIP_MT_stabilize_2d_rotation_specials, - CLIP_MT_stabilize_2d_specials, CLIP_MT_track, - CLIP_MT_track_color_presets, - CLIP_MT_track_color_specials, - CLIP_MT_track_transform, - CLIP_MT_track_visibility, CLIP_MT_tracking_editor_menus, - CLIP_MT_tracking_settings_presets, - CLIP_MT_tracking_specials, - CLIP_MT_view, - CLIP_PT_active_mask_point, - CLIP_PT_active_mask_spline, + CLIP_MT_masking_editor_menus, + CLIP_PT_track, + CLIP_PT_tools_clip, + CLIP_PT_tools_marker, + CLIP_PT_tracking_settings, + CLIP_PT_tools_tracking, + CLIP_PT_tools_plane_tracking, + CLIP_PT_tools_solve, + CLIP_PT_tools_cleanup, + CLIP_PT_tools_geometry, + CLIP_PT_tools_orientation, + CLIP_PT_tools_object, + CLIP_PT_objects, + CLIP_PT_plane_track, + CLIP_PT_track_settings, + CLIP_PT_tracking_camera, + CLIP_PT_tracking_lens, CLIP_PT_display, - CLIP_PT_footage, - CLIP_PT_footage_info, - CLIP_PT_grease_pencil, - CLIP_PT_grease_pencil_palettecolor, CLIP_PT_marker, CLIP_PT_marker_display, + CLIP_PT_stabilization, + CLIP_PT_proxy, CLIP_PT_mask, - CLIP_PT_mask_display, CLIP_PT_mask_layers, - CLIP_PT_objects, - CLIP_PT_plane_track, - CLIP_PT_proxy, - CLIP_PT_stabilization, - CLIP_PT_tools_cleanup, - CLIP_PT_tools_clip, - CLIP_PT_tools_geometry, - CLIP_PT_tools_grease_pencil_brush, - CLIP_PT_tools_grease_pencil_brushcurves, - CLIP_PT_tools_grease_pencil_draw, - CLIP_PT_tools_grease_pencil_edit, - CLIP_PT_tools_grease_pencil_sculpt, - CLIP_PT_tools_marker, + CLIP_PT_mask_display, + CLIP_PT_active_mask_spline, + CLIP_PT_active_mask_point, CLIP_PT_tools_mask, CLIP_PT_tools_mask_add, CLIP_PT_tools_mask_transforms, - CLIP_PT_tools_object, - CLIP_PT_tools_orientation, - CLIP_PT_tools_plane_tracking, + CLIP_PT_footage, + CLIP_PT_footage_info, CLIP_PT_tools_scenesetup, - CLIP_PT_tools_solve, - CLIP_PT_tools_tracking, - CLIP_PT_track, - CLIP_PT_track_settings, - CLIP_PT_tracking_camera, - CLIP_PT_tracking_lens, - CLIP_PT_tracking_settings, - CLIP_UL_tracking_objects, + CLIP_PT_grease_pencil, + CLIP_PT_grease_pencil_palettecolor, + CLIP_PT_tools_grease_pencil_draw, + CLIP_PT_tools_grease_pencil_edit, + CLIP_PT_tools_grease_pencil_sculpt, + CLIP_PT_tools_grease_pencil_brush, + CLIP_PT_tools_grease_pencil_brushcurves, + CLIP_MT_view, + CLIP_MT_clip, + CLIP_MT_proxy, + CLIP_MT_reconstruction, + CLIP_MT_track_visibility, + CLIP_MT_track_transform, + CLIP_MT_select, + CLIP_MT_select_grouped, + CLIP_MT_tracking_specials, + CLIP_MT_camera_presets, + CLIP_MT_track_color_presets, + CLIP_MT_tracking_settings_presets, + CLIP_MT_track_color_specials, + CLIP_MT_stabilize_2d_specials, + CLIP_MT_stabilize_2d_rotation_specials, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py index 487f0061964..e6f96d989c7 100644 --- a/release/scripts/startup/bl_ui/space_console.py +++ b/release/scripts/startup/bl_ui/space_console.py @@ -105,8 +105,8 @@ def add_scrollback(text, text_type): classes = ( CONSOLE_HT_header, - CONSOLE_MT_console, CONSOLE_MT_editor_menus, + CONSOLE_MT_console, CONSOLE_MT_language, ) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 5e4afbf1bf2..e02649219dd 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -451,16 +451,16 @@ class DOPESHEET_MT_delete(Menu): classes = ( DOPESHEET_HT_header, - DOPESHEET_MT_channel, - DOPESHEET_MT_delete, DOPESHEET_MT_editor_menus, - DOPESHEET_MT_gpencil_channel, - DOPESHEET_MT_gpencil_frame, + DOPESHEET_MT_view, + DOPESHEET_MT_select, + DOPESHEET_MT_marker, + DOPESHEET_MT_channel, DOPESHEET_MT_key, DOPESHEET_MT_key_transform, - DOPESHEET_MT_marker, - DOPESHEET_MT_select, - DOPESHEET_MT_view, + DOPESHEET_MT_gpencil_channel, + DOPESHEET_MT_gpencil_frame, + DOPESHEET_MT_delete, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 117d90fe031..bd72dfa9370 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -249,13 +249,13 @@ class FILEBROWSER_PT_advanced_filter(Panel): classes = ( FILEBROWSER_HT_header, + FILEBROWSER_UL_dir, + FILEBROWSER_PT_system_folders, + FILEBROWSER_PT_system_bookmarks, FILEBROWSER_MT_bookmarks_specials, - FILEBROWSER_PT_advanced_filter, FILEBROWSER_PT_bookmarks, FILEBROWSER_PT_recent_folders, - FILEBROWSER_PT_system_bookmarks, - FILEBROWSER_PT_system_folders, - FILEBROWSER_UL_dir, + FILEBROWSER_PT_advanced_filter, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index d48b6650460..21b49df61ae 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -301,14 +301,14 @@ class GRAPH_MT_delete(Menu): classes = ( GRAPH_HT_header, - GRAPH_MT_channel, - GRAPH_MT_delete, GRAPH_MT_editor_menus, + GRAPH_MT_view, + GRAPH_MT_select, + GRAPH_MT_marker, + GRAPH_MT_channel, GRAPH_MT_key, GRAPH_MT_key_transform, - GRAPH_MT_marker, - GRAPH_MT_select, - GRAPH_MT_view, + GRAPH_MT_delete, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 38ec1b7a859..b274657b4f4 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1243,55 +1243,55 @@ class IMAGE_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Pan classes = ( - IMAGE_HT_header, + IMAGE_MT_view, + IMAGE_MT_select, IMAGE_MT_brush, IMAGE_MT_image, IMAGE_MT_image_invert, - IMAGE_MT_select, IMAGE_MT_uvs, - IMAGE_MT_uvs_mirror, - IMAGE_MT_uvs_proportional, - IMAGE_MT_uvs_select_mode, IMAGE_MT_uvs_showhide, - IMAGE_MT_uvs_snap, + IMAGE_MT_uvs_proportional, IMAGE_MT_uvs_transform, + IMAGE_MT_uvs_snap, + IMAGE_MT_uvs_mirror, IMAGE_MT_uvs_weldalign, - IMAGE_MT_view, - IMAGE_PT_active_mask_point, - IMAGE_PT_active_mask_spline, - IMAGE_PT_game_properties, - IMAGE_PT_grease_pencil, - IMAGE_PT_grease_pencil_palettecolor, - IMAGE_PT_image_properties, + IMAGE_MT_uvs_select_mode, + IMAGE_HT_header, + MASK_MT_editor_menus, IMAGE_PT_mask, - IMAGE_PT_mask_display, IMAGE_PT_mask_layers, + IMAGE_PT_mask_display, + IMAGE_PT_active_mask_spline, + IMAGE_PT_active_mask_point, + IMAGE_PT_image_properties, + IMAGE_PT_game_properties, + IMAGE_PT_view_properties, + IMAGE_PT_tools_transform_uvs, IMAGE_PT_paint, - IMAGE_PT_paint_curve, - IMAGE_PT_paint_stroke, - IMAGE_PT_sample_line, - IMAGE_PT_scope_sample, - IMAGE_PT_tools_brush_appearance, IMAGE_PT_tools_brush_overlay, IMAGE_PT_tools_brush_texture, - IMAGE_PT_tools_brush_tool, - IMAGE_PT_tools_grease_pencil_brush, - IMAGE_PT_tools_grease_pencil_brushcurves, - IMAGE_PT_tools_grease_pencil_draw, - IMAGE_PT_tools_grease_pencil_edit, - IMAGE_PT_tools_grease_pencil_sculpt, - IMAGE_PT_tools_imagepaint_symmetry, IMAGE_PT_tools_mask, IMAGE_PT_tools_mask_texture, + IMAGE_PT_tools_brush_tool, + IMAGE_PT_paint_stroke, + IMAGE_PT_paint_curve, + IMAGE_PT_tools_imagepaint_symmetry, + IMAGE_PT_tools_brush_appearance, IMAGE_PT_tools_paint_options, - IMAGE_PT_tools_transform_uvs, - IMAGE_PT_view_histogram, - IMAGE_PT_view_properties, - IMAGE_PT_view_vectorscope, - IMAGE_PT_view_waveform, IMAGE_UV_sculpt, IMAGE_UV_sculpt_curve, - MASK_MT_editor_menus, + IMAGE_PT_view_histogram, + IMAGE_PT_view_waveform, + IMAGE_PT_view_vectorscope, + IMAGE_PT_sample_line, + IMAGE_PT_scope_sample, + IMAGE_PT_grease_pencil, + IMAGE_PT_grease_pencil_palettecolor, + IMAGE_PT_tools_grease_pencil_draw, + IMAGE_PT_tools_grease_pencil_edit, + IMAGE_PT_tools_grease_pencil_sculpt, + IMAGE_PT_tools_grease_pencil_brush, + IMAGE_PT_tools_grease_pencil_brushcurves, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index e6adb87bc9f..16ac6339504 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -345,15 +345,15 @@ classes = ( INFO_HT_header, INFO_MT_editor_menus, INFO_MT_file, + INFO_MT_file_import, INFO_MT_file_export, INFO_MT_file_external_data, - INFO_MT_file_import, INFO_MT_file_previews, INFO_MT_game, - INFO_MT_help, - INFO_MT_opengl_render, INFO_MT_render, + INFO_MT_opengl_render, INFO_MT_window, + INFO_MT_help, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_logic.py b/release/scripts/startup/bl_ui/space_logic.py index 0b538131b0e..b552181f491 100644 --- a/release/scripts/startup/bl_ui/space_logic.py +++ b/release/scripts/startup/bl_ui/space_logic.py @@ -132,11 +132,11 @@ class LOGIC_MT_view(Menu): classes = ( + LOGIC_PT_properties, + LOGIC_MT_logicbricks_add, LOGIC_HT_header, LOGIC_MT_editor_menus, - LOGIC_MT_logicbricks_add, LOGIC_MT_view, - LOGIC_PT_properties, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 2a855f47d37..65d020477dc 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -212,13 +212,13 @@ class NLA_MT_edit_transform(Menu): classes = ( NLA_HT_header, - NLA_MT_add, NLA_MT_edit, - NLA_MT_edit_transform, NLA_MT_editor_menus, - NLA_MT_marker, - NLA_MT_select, NLA_MT_view, + NLA_MT_select, + NLA_MT_marker, + NLA_MT_add, + NLA_MT_edit_transform, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 4d8d9f50a9e..b939d34e154 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -528,27 +528,27 @@ def node_draw_tree_view(layout, context): classes = ( NODE_HT_header, - NODE_MT_add, NODE_MT_editor_menus, + NODE_MT_add, + NODE_MT_view, + NODE_MT_select, NODE_MT_node, NODE_MT_node_color_presets, NODE_MT_node_color_specials, - NODE_MT_select, - NODE_MT_view, - NODE_PT_active_node_color, NODE_PT_active_node_generic, + NODE_PT_active_node_color, NODE_PT_active_node_properties, NODE_PT_backdrop, + NODE_PT_quality, + NODE_UL_interface_sockets, NODE_PT_grease_pencil, NODE_PT_grease_pencil_palettecolor, NODE_PT_grease_pencil_tools, - NODE_PT_quality, - NODE_PT_tools_grease_pencil_brush, - NODE_PT_tools_grease_pencil_brushcurves, NODE_PT_tools_grease_pencil_draw, NODE_PT_tools_grease_pencil_edit, NODE_PT_tools_grease_pencil_sculpt, - NODE_UL_interface_sockets, + NODE_PT_tools_grease_pencil_brush, + NODE_PT_tools_grease_pencil_brushcurves, ) diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 6ff5498cb4a..4eb550bbb35 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -133,10 +133,10 @@ class OUTLINER_MT_edit_datablocks(Menu): classes = ( OUTLINER_HT_header, - OUTLINER_MT_edit_datablocks, OUTLINER_MT_editor_menus, - OUTLINER_MT_search, OUTLINER_MT_view, + OUTLINER_MT_search, + OUTLINER_MT_edit_datablocks, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index ec347bdd666..01da3b48f7d 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1241,32 +1241,32 @@ class SEQUENCER_PT_custom_props(SequencerButtonsPanel, PropertyPanel, Panel): classes = ( SEQUENCER_HT_header, - SEQUENCER_MT_add, - SEQUENCER_MT_add_effect, - SEQUENCER_MT_change, SEQUENCER_MT_editor_menus, - SEQUENCER_MT_frame, - SEQUENCER_MT_marker, - SEQUENCER_MT_select, - SEQUENCER_MT_strip, SEQUENCER_MT_view, SEQUENCER_MT_view_toggle, - SEQUENCER_PT_custom_props, + SEQUENCER_MT_select, + SEQUENCER_MT_marker, + SEQUENCER_MT_change, + SEQUENCER_MT_frame, + SEQUENCER_MT_add, + SEQUENCER_MT_add_effect, + SEQUENCER_MT_strip, SEQUENCER_PT_edit, SEQUENCER_PT_effect, - SEQUENCER_PT_filter, - SEQUENCER_PT_grease_pencil, - SEQUENCER_PT_grease_pencil_palettecolor, - SEQUENCER_PT_grease_pencil_tools, SEQUENCER_PT_input, + SEQUENCER_PT_sound, + SEQUENCER_PT_scene, SEQUENCER_PT_mask, - SEQUENCER_PT_modifiers, - SEQUENCER_PT_preview, + SEQUENCER_PT_filter, SEQUENCER_PT_proxy, - SEQUENCER_PT_scene, - SEQUENCER_PT_sound, + SEQUENCER_PT_preview, SEQUENCER_PT_view, SEQUENCER_PT_view_safe_areas, + SEQUENCER_PT_modifiers, + SEQUENCER_PT_grease_pencil, + SEQUENCER_PT_grease_pencil_palettecolor, + SEQUENCER_PT_grease_pencil_tools, + SEQUENCER_PT_custom_props, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 67b98d530a8..98a7da855ca 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -347,18 +347,18 @@ class TEXT_MT_toolbox(Menu): classes = ( TEXT_HT_header, TEXT_MT_edit, - TEXT_MT_edit_select, - TEXT_MT_edit_to3d, TEXT_MT_editor_menus, - TEXT_MT_format, + TEXT_PT_properties, + TEXT_PT_find, + TEXT_MT_view, + TEXT_MT_text, TEXT_MT_templates, - TEXT_MT_templates_osl, TEXT_MT_templates_py, - TEXT_MT_text, + TEXT_MT_templates_osl, + TEXT_MT_edit_select, + TEXT_MT_format, + TEXT_MT_edit_to3d, TEXT_MT_toolbox, - TEXT_MT_view, - TEXT_PT_find, - TEXT_PT_properties, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 9b2f6b69f80..b9a25cd72a0 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -271,13 +271,13 @@ def marker_menu_generic(layout): classes = ( TIME_HT_header, - TIME_MT_autokey, - TIME_MT_cache, TIME_MT_editor_menus, - TIME_MT_frame, TIME_MT_marker, - TIME_MT_playback, TIME_MT_view, + TIME_MT_cache, + TIME_MT_frame, + TIME_MT_playback, + TIME_MT_autokey, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index faaf54173ff..99ac5a049ee 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1483,22 +1483,22 @@ class USERPREF_PT_addons(Panel): classes = ( USERPREF_HT_header, - USERPREF_MT_addons_online_resources, - USERPREF_MT_appconfigs, + USERPREF_PT_tabs, USERPREF_MT_interaction_presets, - USERPREF_MT_interface_theme_presets, - USERPREF_MT_keyconfigs, - USERPREF_MT_ndof_settings, + USERPREF_MT_appconfigs, USERPREF_MT_splash, USERPREF_MT_splash_footer, - USERPREF_PT_addons, - USERPREF_PT_edit, - USERPREF_PT_file, - USERPREF_PT_input, USERPREF_PT_interface, + USERPREF_PT_edit, USERPREF_PT_system, - USERPREF_PT_tabs, + USERPREF_MT_interface_theme_presets, USERPREF_PT_theme, + USERPREF_PT_file, + USERPREF_MT_ndof_settings, + USERPREF_MT_keyconfigs, + USERPREF_PT_input, + USERPREF_MT_addons_online_resources, + USERPREF_PT_addons, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 920fd1b7067..a2f11fa116a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3788,137 +3788,137 @@ class VIEW3D_PT_context_properties(Panel): rna_prop_ui.draw(self.layout, context, member, object, False) classes = ( - INFO_MT_add, - INFO_MT_armature_add, - INFO_MT_curve_add, - INFO_MT_edit_armature_add, - INFO_MT_edit_curve_add, - INFO_MT_lamp_add, - INFO_MT_mesh_add, - INFO_MT_metaball_add, - INFO_MT_surface_add, VIEW3D_HT_header, - VIEW3D_MT_angle_control, - VIEW3D_MT_armature_specials, - VIEW3D_MT_bone_options_disable, - VIEW3D_MT_bone_options_enable, - VIEW3D_MT_bone_options_toggle, - VIEW3D_MT_brush, - VIEW3D_MT_brush_paint_modes, - VIEW3D_MT_edit_armature, - VIEW3D_MT_edit_armature_delete, - VIEW3D_MT_edit_armature_parent, - VIEW3D_MT_edit_armature_roll, - VIEW3D_MT_edit_curve, - VIEW3D_MT_edit_curve_ctrlpoints, - VIEW3D_MT_edit_curve_delete, - VIEW3D_MT_edit_curve_segments, - VIEW3D_MT_edit_curve_showhide, - VIEW3D_MT_edit_curve_specials, - VIEW3D_MT_edit_font, - VIEW3D_MT_edit_gpencil, - VIEW3D_MT_edit_gpencil_delete, - VIEW3D_MT_edit_gpencil_interpolate, - VIEW3D_MT_edit_gpencil_transform, - VIEW3D_MT_edit_lattice, + VIEW3D_MT_editor_menus, + VIEW3D_MT_transform, + VIEW3D_MT_transform_base, + VIEW3D_MT_transform_object, + VIEW3D_MT_transform_armature, + VIEW3D_MT_mirror, + VIEW3D_MT_snap, + VIEW3D_MT_uv_map, + VIEW3D_MT_edit_proportional, + VIEW3D_MT_view, + VIEW3D_MT_view_navigation, + VIEW3D_MT_view_align, + VIEW3D_MT_view_align_selected, + VIEW3D_MT_view_cameras, + VIEW3D_MT_select_object, + VIEW3D_MT_select_object_more_less, + VIEW3D_MT_select_pose, + VIEW3D_MT_select_pose_more_less, + VIEW3D_MT_select_particle, VIEW3D_MT_edit_mesh, - VIEW3D_MT_edit_mesh_clean, - VIEW3D_MT_edit_mesh_delete, - VIEW3D_MT_edit_mesh_edges, - VIEW3D_MT_edit_mesh_extrude, - VIEW3D_MT_edit_mesh_faces, - VIEW3D_MT_edit_mesh_normals, + VIEW3D_MT_edit_mesh_select_similar, VIEW3D_MT_edit_mesh_select_by_trait, - VIEW3D_MT_edit_mesh_select_mode, VIEW3D_MT_edit_mesh_select_more_less, - VIEW3D_MT_edit_mesh_select_similar, - VIEW3D_MT_edit_mesh_showhide, - VIEW3D_MT_edit_mesh_specials, - VIEW3D_MT_edit_mesh_vertices, - VIEW3D_MT_edit_meta, - VIEW3D_MT_edit_meta_showhide, - VIEW3D_MT_edit_proportional, - VIEW3D_MT_edit_surface, - VIEW3D_MT_edit_text_chars, - VIEW3D_MT_editor_menus, - VIEW3D_MT_hide_mask, - VIEW3D_MT_hook, - VIEW3D_MT_make_links, - VIEW3D_MT_make_single_user, - VIEW3D_MT_mirror, + VIEW3D_MT_select_edit_mesh, + VIEW3D_MT_select_edit_curve, + VIEW3D_MT_select_edit_surface, + VIEW3D_MT_select_edit_text, + VIEW3D_MT_select_edit_metaball, + VIEW3D_MT_select_edit_lattice, + VIEW3D_MT_select_edit_armature, + VIEW3D_MT_select_gpencil, + VIEW3D_MT_select_paint_mask, + VIEW3D_MT_select_paint_mask_vertex, + VIEW3D_MT_angle_control, + INFO_MT_mesh_add, + INFO_MT_curve_add, + INFO_MT_surface_add, + INFO_MT_metaball_add, + INFO_MT_edit_curve_add, + INFO_MT_edit_armature_add, + INFO_MT_armature_add, + INFO_MT_lamp_add, + INFO_MT_add, VIEW3D_MT_object, VIEW3D_MT_object_animation, - VIEW3D_MT_object_apply, VIEW3D_MT_object_clear, - VIEW3D_MT_object_constraints, - VIEW3D_MT_object_game, - VIEW3D_MT_object_group, + VIEW3D_MT_object_specials, + VIEW3D_MT_object_apply, VIEW3D_MT_object_parent, + VIEW3D_MT_object_track, + VIEW3D_MT_object_group, + VIEW3D_MT_object_constraints, VIEW3D_MT_object_quick_effects, VIEW3D_MT_object_showhide, - VIEW3D_MT_object_specials, - VIEW3D_MT_object_track, + VIEW3D_MT_make_single_user, + VIEW3D_MT_make_links, + VIEW3D_MT_object_game, + VIEW3D_MT_brush, + VIEW3D_MT_brush_paint_modes, VIEW3D_MT_paint_vertex, + VIEW3D_MT_hook, + VIEW3D_MT_vertex_group, VIEW3D_MT_paint_weight, + VIEW3D_MT_sculpt, + VIEW3D_MT_hide_mask, VIEW3D_MT_particle, - VIEW3D_MT_particle_showhide, VIEW3D_MT_particle_specials, + VIEW3D_MT_particle_showhide, VIEW3D_MT_pose, - VIEW3D_MT_pose_apply, - VIEW3D_MT_pose_constraints, - VIEW3D_MT_pose_group, - VIEW3D_MT_pose_ik, + VIEW3D_MT_pose_transform, + VIEW3D_MT_pose_slide, + VIEW3D_MT_pose_propagate, VIEW3D_MT_pose_library, VIEW3D_MT_pose_motion, - VIEW3D_MT_pose_propagate, + VIEW3D_MT_pose_group, + VIEW3D_MT_pose_ik, + VIEW3D_MT_pose_constraints, VIEW3D_MT_pose_showhide, - VIEW3D_MT_pose_slide, + VIEW3D_MT_pose_apply, VIEW3D_MT_pose_specials, - VIEW3D_MT_pose_transform, - VIEW3D_MT_sculpt, - VIEW3D_MT_select_edit_armature, - VIEW3D_MT_select_edit_curve, - VIEW3D_MT_select_edit_lattice, - VIEW3D_MT_select_edit_mesh, - VIEW3D_MT_select_edit_metaball, - VIEW3D_MT_select_edit_surface, - VIEW3D_MT_select_edit_text, - VIEW3D_MT_select_gpencil, - VIEW3D_MT_select_object, - VIEW3D_MT_select_object_more_less, - VIEW3D_MT_select_paint_mask, - VIEW3D_MT_select_paint_mask_vertex, - VIEW3D_MT_select_particle, - VIEW3D_MT_select_pose, - VIEW3D_MT_select_pose_more_less, - VIEW3D_MT_snap, - VIEW3D_MT_transform, - VIEW3D_MT_transform_armature, - VIEW3D_MT_transform_base, - VIEW3D_MT_transform_object, - VIEW3D_MT_uv_map, - VIEW3D_MT_vertex_group, - VIEW3D_MT_view, - VIEW3D_MT_view_align, - VIEW3D_MT_view_align_selected, - VIEW3D_MT_view_cameras, - VIEW3D_MT_view_navigation, - VIEW3D_PT_background_image, - VIEW3D_PT_context_properties, - VIEW3D_PT_etch_a_ton, + VIEW3D_MT_bone_options_toggle, + VIEW3D_MT_bone_options_enable, + VIEW3D_MT_bone_options_disable, + VIEW3D_MT_edit_mesh_specials, + VIEW3D_MT_edit_mesh_select_mode, + VIEW3D_MT_edit_mesh_extrude, + VIEW3D_MT_edit_mesh_vertices, + VIEW3D_MT_edit_mesh_edges, + VIEW3D_MT_edit_mesh_faces, + VIEW3D_MT_edit_mesh_normals, + VIEW3D_MT_edit_mesh_clean, + VIEW3D_MT_edit_mesh_delete, + VIEW3D_MT_edit_mesh_showhide, + VIEW3D_MT_edit_gpencil, + VIEW3D_MT_edit_gpencil_delete, + VIEW3D_MT_edit_curve, + VIEW3D_MT_edit_curve_ctrlpoints, + VIEW3D_MT_edit_curve_segments, + VIEW3D_MT_edit_curve_specials, + VIEW3D_MT_edit_curve_delete, + VIEW3D_MT_edit_curve_showhide, + VIEW3D_MT_edit_surface, + VIEW3D_MT_edit_font, + VIEW3D_MT_edit_text_chars, + VIEW3D_MT_edit_meta, + VIEW3D_MT_edit_meta_showhide, + VIEW3D_MT_edit_lattice, + VIEW3D_MT_edit_armature, + VIEW3D_MT_armature_specials, + VIEW3D_MT_edit_armature_parent, + VIEW3D_MT_edit_armature_roll, + VIEW3D_MT_edit_armature_delete, + VIEW3D_MT_edit_gpencil_transform, + VIEW3D_MT_edit_gpencil_interpolate, VIEW3D_PT_grease_pencil, VIEW3D_PT_grease_pencil_palettecolor, - VIEW3D_PT_transform_orientations, + VIEW3D_PT_view3d_properties, VIEW3D_PT_view3d_cursor, - VIEW3D_PT_view3d_curvedisplay, + VIEW3D_PT_view3d_name, VIEW3D_PT_view3d_display, + VIEW3D_PT_view3d_stereo, + VIEW3D_PT_view3d_shading, + VIEW3D_PT_view3d_motion_tracking, VIEW3D_PT_view3d_meshdisplay, VIEW3D_PT_view3d_meshstatvis, - VIEW3D_PT_view3d_motion_tracking, - VIEW3D_PT_view3d_name, - VIEW3D_PT_view3d_properties, - VIEW3D_PT_view3d_shading, - VIEW3D_PT_view3d_stereo, + VIEW3D_PT_view3d_curvedisplay, + VIEW3D_PT_background_image, + VIEW3D_PT_transform_orientations, + VIEW3D_PT_etch_a_ton, + VIEW3D_PT_context_properties, ) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index ad83da7db83..d58453deaef 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -2009,65 +2009,65 @@ class VIEW3D_PT_tools_history(View3DPanel, Panel): classes = ( - TEXTURE_UL_texpaintslots, - VIEW3D_MT_tools_projectpaint_stencil, - VIEW3D_MT_tools_projectpaint_uvlayer, - VIEW3D_PT_imapaint_tools_missing, - VIEW3D_PT_sculpt_dyntopo, - VIEW3D_PT_sculpt_options, - VIEW3D_PT_sculpt_symmetry, - VIEW3D_PT_slots_projectpaint, - VIEW3D_PT_stencil_projectpaint, - VIEW3D_PT_tools_add_curve_edit, - VIEW3D_PT_tools_add_mball_edit, - VIEW3D_PT_tools_add_mesh_edit, + VIEW3D_PT_tools_transform, + VIEW3D_PT_tools_object, VIEW3D_PT_tools_add_object, - VIEW3D_PT_tools_add_surface_edit, + VIEW3D_PT_tools_relations, VIEW3D_PT_tools_animation, + VIEW3D_PT_tools_rigid_body, + VIEW3D_PT_tools_transform_mesh, + VIEW3D_PT_tools_meshedit, + VIEW3D_PT_tools_meshweight, + VIEW3D_PT_tools_add_mesh_edit, + VIEW3D_PT_tools_shading, + VIEW3D_PT_tools_uvs, + VIEW3D_PT_tools_meshedit_options, + VIEW3D_PT_tools_transform_curve, + VIEW3D_PT_tools_curveedit, + VIEW3D_PT_tools_add_curve_edit, + VIEW3D_PT_tools_curveedit_options_stroke, + VIEW3D_PT_tools_transform_surface, + VIEW3D_PT_tools_surfaceedit, + VIEW3D_PT_tools_add_surface_edit, + VIEW3D_PT_tools_textedit, VIEW3D_PT_tools_armatureedit, - VIEW3D_PT_tools_armatureedit_options, VIEW3D_PT_tools_armatureedit_transform, + VIEW3D_PT_tools_armatureedit_options, + VIEW3D_PT_tools_mballedit, + VIEW3D_PT_tools_add_mball_edit, + VIEW3D_PT_tools_latticeedit, + VIEW3D_PT_tools_posemode, + VIEW3D_PT_tools_posemode_options, + VIEW3D_PT_imapaint_tools_missing, VIEW3D_PT_tools_brush, - VIEW3D_PT_tools_brush_appearance, - VIEW3D_PT_tools_brush_curve, + TEXTURE_UL_texpaintslots, + VIEW3D_MT_tools_projectpaint_uvlayer, + VIEW3D_PT_slots_projectpaint, + VIEW3D_PT_stencil_projectpaint, VIEW3D_PT_tools_brush_overlay, - VIEW3D_PT_tools_brush_stroke, VIEW3D_PT_tools_brush_texture, - VIEW3D_PT_tools_curveedit, - VIEW3D_PT_tools_curveedit_options_stroke, - VIEW3D_PT_tools_grease_pencil_brush, - VIEW3D_PT_tools_grease_pencil_brushcurves, + VIEW3D_PT_tools_mask_texture, + VIEW3D_PT_tools_brush_stroke, + VIEW3D_PT_tools_brush_curve, + VIEW3D_PT_sculpt_dyntopo, + VIEW3D_PT_sculpt_options, + VIEW3D_PT_sculpt_symmetry, + VIEW3D_PT_tools_brush_appearance, + VIEW3D_PT_tools_weightpaint, + VIEW3D_PT_tools_weightpaint_options, + VIEW3D_PT_tools_vertexpaint, + VIEW3D_PT_tools_imagepaint_external, + VIEW3D_PT_tools_imagepaint_symmetry, + VIEW3D_PT_tools_projectpaint, + VIEW3D_MT_tools_projectpaint_stencil, + VIEW3D_PT_tools_particlemode, VIEW3D_PT_tools_grease_pencil_draw, VIEW3D_PT_tools_grease_pencil_edit, VIEW3D_PT_tools_grease_pencil_interpolate, VIEW3D_PT_tools_grease_pencil_sculpt, + VIEW3D_PT_tools_grease_pencil_brush, + VIEW3D_PT_tools_grease_pencil_brushcurves, VIEW3D_PT_tools_history, - VIEW3D_PT_tools_imagepaint_external, - VIEW3D_PT_tools_imagepaint_symmetry, - VIEW3D_PT_tools_latticeedit, - VIEW3D_PT_tools_mask_texture, - VIEW3D_PT_tools_mballedit, - VIEW3D_PT_tools_meshedit, - VIEW3D_PT_tools_meshedit_options, - VIEW3D_PT_tools_meshweight, - VIEW3D_PT_tools_object, - VIEW3D_PT_tools_particlemode, - VIEW3D_PT_tools_posemode, - VIEW3D_PT_tools_posemode_options, - VIEW3D_PT_tools_projectpaint, - VIEW3D_PT_tools_relations, - VIEW3D_PT_tools_rigid_body, - VIEW3D_PT_tools_shading, - VIEW3D_PT_tools_surfaceedit, - VIEW3D_PT_tools_textedit, - VIEW3D_PT_tools_transform, - VIEW3D_PT_tools_transform_curve, - VIEW3D_PT_tools_transform_mesh, - VIEW3D_PT_tools_transform_surface, - VIEW3D_PT_tools_uvs, - VIEW3D_PT_tools_vertexpaint, - VIEW3D_PT_tools_weightpaint, - VIEW3D_PT_tools_weightpaint_options, ) if __name__ == "__main__": # only for live edit. -- cgit v1.2.3