[Sass] Don't pass @options to Environment#initialize.

lib/sass/engine.rb

@@ -99,7 +99,7 @@ module Sass
 
     # Processes the template and returns the result as a string.
     def render
-      to_tree.perform(Environment.new(nil, @options)).to_s
+      to_tree.perform(Environment.new).to_s
     end
 
     alias_method :to_css, :render

lib/sass/environment.rb

@@ -1,12 +1,12 @@
 module Sass
   class Environment
     attr_reader :parent
+    attr_writer :options
 
-    def initialize(parent = nil, options = nil)
+    def initialize(parent = nil)
       @vars = {}
       @mixins = {}
       @parent = parent
-      @options = options
 
       set_var("important", Script::String.new("!important")) unless @parent
     end

lib/sass/plugin.rb

@@ -69,9 +69,9 @@ module Sass
         File.delete(css) if File.exists?(css)
 
         filename = template_filename(name, template_location)
-        options = engine_options(:css_filename => css, :filename => filename)
         result = begin
-                   Engine.tree_for(filename, options).perform(Environment.new(nil, options)).to_s
+                   Engine.tree_for(filename, engine_options(:css_filename => css, :filename => filename)).
+                     perform(Environment.new).to_s
                  rescue Exception => e
                    exception_string(e)
                  end

lib/sass/tree/node.rb

@@ -51,6 +51,7 @@ module Sass
       end
 
       def perform(environment)
+        environment.options = @options if self.class == Tree::Node
         _perform(environment)
       rescue Sass::SyntaxError => e; e.add_metadata(filename, line)
       end