[Bf-blender-cvs] [703bb0f] master: Ref T42873: Print "Camera Pano" for panoramic camera view onto viewport

julianeisel noreply at git.blender.org
Wed Dec 24 19:38:10 CET 2014


Commit: 703bb0f62dbcd2a6ddebd1faae238790c0e19a46
Author: julianeisel
Date:   Wed Dec 24 19:35:12 2014 +0100
Branches: master
https://developer.blender.org/rB703bb0f62dbcd2a6ddebd1faae238790c0e19a46

Ref T42873: Print "Camera Pano" for panoramic camera view onto viewport

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 87ab57e..44c0460 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -787,7 +787,16 @@ static const char *view3d_get_name(View3D *v3d, RegionView3D *rv3d)
 				if ((v3d->camera) && (v3d->camera->type == OB_CAMERA)) {
 					Camera *cam;
 					cam = v3d->camera->data;
-					name = (cam->type != CAM_ORTHO) ? IFACE_("Camera Persp") : IFACE_("Camera Ortho");
+					if (cam->type == CAM_PERSP) {
+						name = IFACE_("Camera Persp");
+					}
+					else if (cam->type == CAM_ORTHO) {
+						name = IFACE_("Camera Ortho");
+					}
+					else {
+						BLI_assert(cam->type == CAM_PANO);
+						name = IFACE_("Camera Pano");
+					}
 				}
 				else {
 					name = IFACE_("Object as Camera");




More information about the Bf-blender-cvs mailing list