Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.h
index 9d36e5c0214616c903e928f1e65e7d517d66f147..e736158943648c8eb3bdd69165a5d11b5c4308bb 100644 (file)
@@ -141,7 +141,7 @@ private:
        void sync_images();
 
        /* util */
-       void find_shader(BL::ID& id, vector<uint>& used_shaders, int default_shader);
+       void find_shader(BL::ID& id, vector<Shader*>& used_shaders, Shader *default_shader);
        bool BKE_object_is_modified(BL::Object& b_ob);
        bool object_is_mesh(BL::Object& b_ob);
        bool object_is_light(BL::Object& b_ob);
@@ -179,7 +179,6 @@ private:
                  use_surfaces(true),
                  use_hair(true),
                  use_viewport_visibility(false),
-                 use_localview(false),
                  samples(0), bound_samples(false)
                {}
 
@@ -194,7 +193,6 @@ private:
                bool use_surfaces;
                bool use_hair;
                bool use_viewport_visibility;
-               bool use_localview;
                int samples;
                bool bound_samples;
        } render_layer;