Skip to content

GitLab

Commit 492c07f0 authored by Jan Kremer's avatar Jan Kremer
Browse files
Options

Fixed a crash.

parent a7e99166
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
Config/DefaultInput.ini
View file @ 492c07f0
......@@ -55,7 +55,6 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="SelectMode_OnePlane",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Down)
+ActionMappings=(ActionName="SelectMode_TwoPlanes",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Left)
+ActionMappings=(ActionName="SelectMode_Sphere",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Thumbstick_Up)
+ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=BackSpace)
+ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
+ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
+ActionMappings=(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Zero)
......@@ -66,8 +65,6 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder)
+ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_FaceButton1)
+ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
+ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Trigger)
+ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Trigger)
+ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
+ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
+ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
......
Intermediate/Config/CoalescedSourceConfigs/Input.ini
View file @ 492c07f0
......@@ -52,7 +52,6 @@ ActionMappings=(ActionName="SelectMode_None",bShift=False,bCtrl=False,bAlt=False
ActionMappings=(ActionName="SelectMode_OnePlane",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Down)
ActionMappings=(ActionName="SelectMode_TwoPlanes",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Left)
ActionMappings=(ActionName="SelectMode_Sphere",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Thumbstick_Up)
ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=BackSpace)
ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
ActionMappings=(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Zero)
......@@ -63,8 +62,6 @@ ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=Fa
ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder)
ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_FaceButton1)
ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Trigger)
ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Trigger)
ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
......
Source/ImmersiveAnalytics/Plot3D.cpp
View file @ 492c07f0
......@@ -102,7 +102,10 @@ void APlot3D::BrushPoints(TArray<int32> BrushPoints, bool Rebuild)
{
for (int i = 0; i < BrushPoints.Num(); ++i)
{
BrushPoint(BrushPoints[i], Data->IsBrushed[BrushPoints[i]]);
if (BrushPoints[i] != -1)
{
BrushPoint(BrushPoints[i], Data->IsBrushed[BrushPoints[i]]);
}
}
if (Rebuild)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment