From a3e6108aa15dadb8d245900a166f3f88648df507 Mon Sep 17 00:00:00 2001
From: Philosopher <NasalMusician@gmail.com>
Date: Sun, 19 Jan 2014 15:52:38 -0600
Subject: [PATCH 1/2] Fix #1310 - typo in material.nas

A small processing mistake on my part during commit d8b23d94.
---
 Nasal/material.nas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nasal/material.nas b/Nasal/material.nas
index d4ad8d631..379f28403 100644
--- a/Nasal/material.nas
+++ b/Nasal/material.nas
@@ -51,7 +51,7 @@
 var dialog = nil;
 
 var colorgroup = func(parent, name, base) {
-	var undef = func { props.globals.getNode(base ~ name ~ "/" ~ parent) == nil };
+	var undef = func(color) { props.globals.getNode(base ~ name ~ "/" ~ color) == nil };
 
 	if (undef("red") and undef("green") and undef("blue")) {
 		return 0;

From 6608cfe841bba4ffecc259f79c672dbcfd141fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Sun, 19 Jan 2014 23:29:25 +0100
Subject: [PATCH 2/2] able to change FoV in spring-loaded mode

---
 mice.xml | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/mice.xml b/mice.xml
index b41927cc8..dd58d03a4 100644
--- a/mice.xml
+++ b/mice.xml
@@ -41,6 +41,34 @@ current mode for each mouse is held in the
         <reason>right-click</reason>
     </binding>
    </button>
+
+   <!-- extra buttons control FoV -->
+   <!-- these are often assigned to mouse-wheel motion in Linux -->
+   <button n="3">
+    <binding>
+     <condition>
+       <and>
+         <property>/devices/status/mice/mouse[0]/button[2]</property>
+         <not><property>/sim/mouse/right-button-mode-cycle-enabled</property></not>
+       </and>
+     </condition>
+      <command>nasal</command>
+      <script>view.decrease()</script>
+    </binding>
+   </button>
+
+   <button n="4">
+    <binding>
+     <condition>
+       <and>
+         <property>/devices/status/mice/mouse[0]/button[2]</property>
+         <not><property>/sim/mouse/right-button-mode-cycle-enabled</property></not>
+       </and>
+     </condition>
+      <command>nasal</command>
+      <script>view.increase()</script>
+    </binding>
+   </button>
  
   </mode>
 
@@ -309,28 +337,6 @@ current mode for each mouse is held in the
    <constrained type="bool">true</constrained>
    <pass-through type="bool">false</pass-through>
 
-   <!-- extra buttons control FoV -->
-   <!-- these are often assigned to mouse-wheel motion in Linux -->
-   <button n="3">
-    <binding>
-     <condition>
-       <property>/devices/status/mice/mouse[0]/button[2]</property>
-     </condition>
-      <command>nasal</command>
-      <script>view.decrease()</script>
-    </binding>
-   </button>
-
-   <button n="4">
-    <binding>
-     <condition>
-       <property>/devices/status/mice/mouse[0]/button[2]</property>
-     </condition>
-      <command>nasal</command>
-      <script>view.increase()</script>
-    </binding>
-   </button>
-
    <!-- Mouse left/right motion -->
    <x-axis>