Merge pull request #10 from mmiscool/master

Master

web/app/3d/actions/core-actions.js

@@ -2,7 +2,7 @@ import * as ActionHelpers from './action-helpers'
 
 export const EditFace = {
   cssIcons: ['file-picture-o'],
-  label: 'edit',
+  label: 'edit sketch',
   icon96: 'img/3d/face-edit96.png',
   info: 'open sketcher for a face/plane',
   listens: ['selection'],

web/app/3d/operations.js

@@ -13,7 +13,7 @@ export const PAD = {
 };
 
 export const REVOLVE = {
-  icon: 'img/3d/shell',
+  icon: 'img/3d/revolve',
   label: 'Revolve',
   info: (p) => '(' + p.angle + ')'
 };

web/app/3d/ui/ctrl.js

@@ -60,12 +60,14 @@ function UI(app) {
 
 UI.prototype.createCraftToolBar = function (vertPos) {
   var toolBar = new ToolBar(this.app);
-  toolBar.add(this.app.actionManager.actions['EditFace']);
-  toolBar.add(this.app.actionManager.actions['CUT']);
-  toolBar.add(this.app.actionManager.actions['PAD']);
   toolBar.add(this.app.actionManager.actions['PLANE']);
-  toolBar.add(this.app.actionManager.actions['BOX']);
-  toolBar.add(this.app.actionManager.actions['SPHERE']);
+  toolBar.add(this.app.actionManager.actions['EditFace']);
+  toolBar.add(this.app.actionManager.actions['PAD']);
+  toolBar.add(this.app.actionManager.actions['CUT']);
+  toolBar.add(this.app.actionManager.actions['REVOLVE']);  
+  
+  
+
   $('#viewer-container').append(toolBar.node);
   toolBar.node.css({left: '10px',top : vertPos + 'px'});
   return toolBar;