Cycles: Make camera-in-volume an official feature

This means it's no longer needed to enable experimental feature set in order to
have proper camera in volume support. And this also means if there's something
wrong going on, or if there's speed regression for cases when camera is obviously
not in the volume -- this issues are to be reported and handled in the regular
matter.

Happy blending!

1 files changed, 9 insertions, 11 deletions

diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 28b6c994568..110adb4d036 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -276,17 +276,15 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 
 	/* Camera in volume. */
 	kcam->is_inside_volume = 0;
-	if(use_camera_in_volume) {
-		BoundBox viewplane_boundbox = viewplane_bounds_get();
-		for(size_t i = 0; i < scene->objects.size(); ++i) {
-			Object *object = scene->objects[i];
-			if(object->mesh->has_volume &&
-			   viewplane_boundbox.intersects(object->bounds))
-			{
-				/* TODO(sergey): Consider adding more grained check. */
-				kcam->is_inside_volume = 1;
-				break;
-			}
+	BoundBox viewplane_boundbox = viewplane_bounds_get();
+	for(size_t i = 0; i < scene->objects.size(); ++i) {
+		Object *object = scene->objects[i];
+		if(object->mesh->has_volume &&
+		   viewplane_boundbox.intersects(object->bounds))
+		{
+			/* TODO(sergey): Consider adding more grained check. */
+			kcam->is_inside_volume = 1;
+			break;
 		}
 	}
 }