From c91eb329393c33a278c604d8c20eb964c2ab3d8c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 15 Aug 2018 18:44:57 -0400 Subject: [PATCH] Nuke auto circle camera Tey're probably just a disaster waiting to happen. If you want a circle camera, that's sufficiently advanced to require a new camera object. Auto cameras are just a dumb helper. --- korman/properties/modifiers/region.py | 2 +- korman/ui/modifiers/region.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/korman/properties/modifiers/region.py b/korman/properties/modifiers/region.py index 73672ff..2c1ce42 100644 --- a/korman/properties/modifiers/region.py +++ b/korman/properties/modifiers/region.py @@ -70,8 +70,8 @@ class PlasmaCameraRegion(PlasmaModifierProperties): camera_type = EnumProperty(name="Camera Type", description="What kind of camera should be used?", items=[("auto_follow", "Auto Follow Camera", "Automatically generated follow camera"), - ("auto_circle", "Auto Circle Camera", "Automatically generated circle camera"), ("manual", "Manual Camera", "User specified camera object")], + default="manual", options=set()) camera_object = PointerProperty(name="Camera", description="Switches to this camera", diff --git a/korman/ui/modifiers/region.py b/korman/ui/modifiers/region.py index 2b18446..52eb6e7 100644 --- a/korman/ui/modifiers/region.py +++ b/korman/ui/modifiers/region.py @@ -28,19 +28,11 @@ def camera_rgn(modifier, layout, context): for i in cb: layout.separator() i(layout, cam_type, cam_props) - def _draw_circle_cam_props(layout, cam_type, props): - # needs a sublayout that we can deactivate because the ui_camera - # version assumes we are most definitely a circle camera... - col = layout.column() - col.active = cam_type == "circle" - col.label("Circle Camera:") - ui_camera.draw_circle_camera_props(col, props) _draw_props(layout, (ui_camera.draw_camera_mode_props, ui_camera.draw_camera_poa_props, ui_camera.draw_camera_pos_props, - ui_camera.draw_camera_manipulation_props, - _draw_circle_cam_props)) + ui_camera.draw_camera_manipulation_props)) def footstep(modifier, layout, context): layout.prop(modifier, "bounds")