From 5d9b93fe486f330203567a61cd87ba0528c4371f Mon Sep 17 00:00:00 2001
From: luna215 <paulluna0215@gmail.com>
Date: Tue, 27 Nov 2018 10:17:00 -0800
Subject: [PATCH] Resolving merge conflict
---
src/mol-geo/geometry/direct-volume/direct-volume.ts | 2 +-
src/mol-plugin/ui/controls/parameters.tsx | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/mol-geo/geometry/direct-volume/direct-volume.ts b/src/mol-geo/geometry/direct-volume/direct-volume.ts
index f566d11d7..6c66f91ab 100644
--- a/src/mol-geo/geometry/direct-volume/direct-volume.ts
+++ b/src/mol-geo/geometry/direct-volume/direct-volume.ts
@@ -130,7 +130,7 @@ export namespace DirectVolume {
ValueCell.updateIfChanged(values.dUseFog, props.useFog)
ValueCell.updateIfChanged(values.dRenderMode, props.renderMode)
- const controlPoints = getControlPointsFromString(props.controlPoints)
+ const controlPoints = getControlPointsFromVec2Array(props.controlPoints)
createTransferFunctionTexture(controlPoints, values.tTransferTex)
}
diff --git a/src/mol-plugin/ui/controls/parameters.tsx b/src/mol-plugin/ui/controls/parameters.tsx
index f0ffdf8ed..a8bd921d2 100644
--- a/src/mol-plugin/ui/controls/parameters.tsx
+++ b/src/mol-plugin/ui/controls/parameters.tsx
@@ -11,7 +11,6 @@ import { ParamDefinition as PD } from 'mol-util/param-definition';
import { camelCaseToWords } from 'mol-util/string';
import { ColorNames, ColorNamesValueMap } from 'mol-util/color/tables';
import { Color } from 'mol-util/color';
-import { Slider } from './slider';
import { Vec2 } from 'mol-math/linear-algebra';
import LineGraphComponent from './LineGraph/LineGraphComponent';
--
GitLab