aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-06 07:54:11 -0700
committerPushkar Joshi2012-06-06 07:54:11 -0700
commitcfa1402ac2ce831a83a9d4263d06c452c157a414 (patch)
treeadb8f1f1ad1c4dd1e7e9eee1bd206f1ec338d20c /js/panels/properties.reel/properties.html
parent8606ee7ec851cb0a971e7556eba5d9386f1b3639 (diff)
parent5ba54dc275b07e7b2d0ed14751761d1e663d3d14 (diff)
downloadninja-cfa1402ac2ce831a83a9d4263d06c452c157a414.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels/properties.reel/properties.html')
-rwxr-xr-xjs/panels/properties.reel/properties.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index ac0dab5a..b9aa206b 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -56,7 +56,10 @@
56 } 56 }
57 }, 57 },
58 "threeDProperties": { 58 "threeDProperties": {
59 "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]" 59 "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
60 "bindings": {
61 "currentDocument": {"<-": "@owner.currentDocument"}
62 }
60 }, 63 },
61 64
62 "CustomSections": { 65 "CustomSections": {