Merge branch 'main-dev' into dev-contextMenu
This commit is contained in:
@@ -17,6 +17,7 @@ import { getUserData } from "../../../functions/getUserData";
|
||||
import ContextControls from "./contextControls/contextControls";
|
||||
import SelectionControls2D from "./selectionControls/selection2D/selectionControls2D";
|
||||
import UndoRedo2DControls from "./undoRedoControls/undoRedo2D/undoRedo2DControls";
|
||||
import UndoRedo3DControls from "./undoRedoControls/undoRedo3D/undoRedo3DControls";
|
||||
|
||||
export default function Controls() {
|
||||
const controlsRef = useRef<CameraControls>(null);
|
||||
@@ -145,6 +146,8 @@ export default function Controls() {
|
||||
|
||||
<UndoRedo2DControls />
|
||||
|
||||
<UndoRedo3DControls />
|
||||
|
||||
<TransformControl />
|
||||
|
||||
<ContextControls />
|
||||
|
||||
Reference in New Issue
Block a user