Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AMOEBA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Amanda Ghassaei
AMOEBA
Commits
4a5cede0
Commit
4a5cede0
authored
May 20, 2016
by
amandaghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small bugs
parent
55cef654
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
js/highlighter/Highlighter.js
js/highlighter/Highlighter.js
+1
-1
js/menus/SketchMenuView.js
js/menus/SketchMenuView.js
+1
-0
No files found.
js/highlighter/Highlighter.js
View file @
4a5cede0
...
...
@@ -94,7 +94,7 @@ define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', '
//highlight
getObjToIntersect
:
function
(){
var
objsToIntersect
=
three
.
get
Cells
();
var
objsToIntersect
=
lattice
.
getHighlightable
Cells
();
if
(
!
appState
.
get
(
"
deleteMode
"
))
objsToIntersect
=
objsToIntersect
.
concat
(
three
.
getBasePlane
());
// if (globals.get("highlighter").isVisible()) objsToIntersect = objsToIntersect.concat(globals.get("highlighter").mesh);
return
objsToIntersect
;
...
...
js/menus/SketchMenuView.js
View file @
4a5cede0
...
...
@@ -12,6 +12,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!menus/templates/Ske
_initialize
:
function
(){
this
.
listenTo
(
globals
.
get
(
"
baseplane
"
),
"
change
"
,
this
.
render
);
this
.
listenTo
(
this
.
model
,
"
change
"
,
this
.
render
);
},
getPropertyOwner
:
function
(
$target
){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment