Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.h
index 2fad7d5..08e0a9b 100644 (file)
@@ -35,6 +35,7 @@
 CCL_NAMESPACE_BEGIN
 
 class Background;
+class BlenderObjectCulling;
 class Camera;
 class Film;
 class Light;
@@ -122,8 +123,7 @@ private:
                            uint layer_flag,
                            float motion_time,
                            bool hide_tris,
-                           bool use_camera_cull,
-                           float camera_cull_margin,
+                           BlenderObjectCulling& culling,
                            bool *use_portal);
        void sync_light(BL::Object& b_parent,
                        int persistent_id[OBJECT_PERSISTENT_ID_SIZE],