merge upstream

leenkx/blender/lnx/props_ui.py

@@ -205,6 +205,8 @@ class LNX_PT_ParticlesPropsPanel(bpy.types.Panel):
         if obj == None:
             return
 
+        layout.prop(obj.settings, 'lnx_auto_start')
+        layout.prop(obj.settings, 'lnx_is_unique')
         layout.prop(obj.settings, 'lnx_loop')
         layout.prop(obj.settings, 'lnx_count_mult')
 
@@ -240,6 +242,7 @@ class LNX_PT_PhysicsPropsPanel(bpy.types.Panel):
             layout.prop(obj, 'lnx_rb_angular_friction')
             layout.prop(obj, 'lnx_rb_trigger')
             layout.prop(obj, 'lnx_rb_ccd')
+            layout.prop(obj, 'lnx_rb_interpolate')
 
         if obj.soft_body is not None:
             layout.prop(obj, 'lnx_soft_body_margin')
@@ -303,8 +306,6 @@ class LNX_PT_DataPropsPanel(bpy.types.Panel):
             layout.prop(obj.data, 'lnx_clip_end')
             layout.prop(obj.data, 'lnx_fov')
             layout.prop(obj.data, 'lnx_shadows_bias')
-            layout.prop(wrd, 'lnx_light_ies_texture')
-            layout.prop(wrd, 'lnx_light_clouds_texture')
         elif obj.type == 'SPEAKER':
             layout.prop(obj.data, 'lnx_play_on_start')
             layout.prop(obj.data, 'lnx_loop')
@@ -332,6 +333,8 @@ class LNX_PT_WorldPropsPanel(bpy.types.Panel):
         if world is None:
             return
 
+        layout.prop(world, 'lnx_light_ies_texture')
+        layout.prop(world, 'lnx_light_clouds_texture')
         layout.prop(world, 'lnx_use_clouds')
         col = layout.column(align=True)
         col.enabled = world.lnx_use_clouds
@@ -1991,10 +1994,18 @@ class LNX_PT_RenderPathCompositorPanel(bpy.types.Panel):
         col.prop(rpdat, 'lnx_letterbox_size')
         layout.separator()
 
+        col = layout.column()
+        col.prop(rpdat, 'lnx_sharpen')
+        col = col.column(align=True)
+        col.enabled = rpdat.lnx_sharpen
+        col.prop(rpdat, 'lnx_sharpen_color')
+        col.prop(rpdat, 'lnx_sharpen_size')
+        col.prop(rpdat, 'lnx_sharpen_strength')
+        layout.separator()
+
         col = layout.column()
         draw_conditional_prop(col, 'Distort', rpdat, 'lnx_distort', 'lnx_distort_strength')
         draw_conditional_prop(col, 'Film Grain', rpdat, 'lnx_grain', 'lnx_grain_strength')
-        draw_conditional_prop(col, 'Sharpen', rpdat, 'lnx_sharpen', 'lnx_sharpen_strength')
         draw_conditional_prop(col, 'Vignette', rpdat, 'lnx_vignette', 'lnx_vignette_strength')
         layout.separator()
 
@@ -2732,8 +2743,33 @@ class LeenkxUpdateListInstalledVSButton(bpy.types.Operator):
 
         return {'FINISHED'}
 
+class LNX_PT_PhysicsProps(bpy.types.Panel):
+    bl_label = "Leenkx Props"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_options = {'DEFAULT_CLOSED'}
+    bl_parent_id = "SCENE_PT_rigid_body_world"
 
-class LNX_PT_BulletDebugDrawingPanel(bpy.types.Panel):
+    @classmethod
+    def poll(cls, context):
+        return context.scene.rigidbody_world is not None
+
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+        layout.use_property_decorate = False
+        wrd = bpy.data.worlds['Lnx']
+
+        if wrd.lnx_physics_engine != 'Bullet' and wrd.lnx_physics_engine != 'Oimo':
+            row = layout.row()
+            row.alert = True
+            row.label(text="Physics debug drawing is only supported for the Bullet and Oimo physics engines")
+
+        col = layout.column(align=False)
+        col.prop(wrd, "lnx_physics_fixed_step")
+
+class LNX_PT_PhysicsDebugDrawingPanel(bpy.types.Panel):
     bl_label = "Leenkx Debug Drawing"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
@@ -2899,7 +2935,8 @@ __REG_CLASSES = (
     LeenkxUpdateListAndroidEmulatorButton,
     LeenkxUpdateListAndroidEmulatorRunButton,
     LeenkxUpdateListInstalledVSButton,
-    LNX_PT_BulletDebugDrawingPanel,
+    LNX_PT_PhysicsProps,
+    LNX_PT_PhysicsDebugDrawingPanel,
     LNX_OT_AddArmatureRootMotion,
     scene.TLM_PT_Settings,
     scene.TLM_PT_Denoise,