Merge 6d6360e into 265748d

uber · Apr 6, 2019 · 468a447 · 468a447
2 parents 265748d + 6d6360e
commit 468a447
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/modules/layers/src/shaderlib/outline/outline.js b/modules/layers/src/shaderlib/outline/outline.js
@@ -8,10 +8,12 @@ const INITIAL_STATE = {
 function getUniforms({ outlineEnabled, outlineRenderShadowmap, outlineShadowmap } = INITIAL_STATE) {
   const uniforms = {};
   if (outlineEnabled !== undefined) {
-    uniforms.outline_uEnabled = outlineEnabled; // ? 1.0 : 0.0;
+    // ? 1.0 : 0.0;
+    uniforms.outline_uEnabled = outlineEnabled;
   }
   if (outlineRenderShadowmap !== undefined) {
-    uniforms.outline_uRenderOutlines = outlineRenderShadowmap; // ? 1.0 : 0.0;
+    // ? 1.0 : 0.0;
+    uniforms.outline_uRenderOutlines = outlineRenderShadowmap;
   }
   if (outlineShadowmap !== undefined) {
     uniforms.outline_uShadowmap = outlineShadowmap;

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "bootstrap": "lerna bootstrap",
     "build": "lerna exec npm run build",
     "pretty": "prettier --write \"{modules,examples,test}/**/*.js\" --loglevel warn",
-    "lint": "prettier-check \"{src,examples,test}/**/*.js\" && eslint src test examples #&& npm run lint-yarn",
+    "lint": "npm run lint-yarn && eslint modules/**/src examples",
     "lint-yarn": "!(grep -q unpm.u yarn.lock) && echo 'Lockfile valid.' || (echo 'Please rebuild yarn file using public npmrc' && false)",
     "flow": "flow",
     "prepublish": "npm run build",