diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-10-22 10:28:39 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-10-22 10:28:39 +0400 |
commit | cfd9d390fcbe92b257d9784f6d12e88e5a66adc9 (patch) | |
tree | e0fbbea03f25b1f5e832280ea9c8fb0c92623ebd /source/blender/src/drawview.c | |
parent | 2cc41ad890326679b47c9931708d3afc3dae300f (diff) |
Several fixes:
* DNA_action_types.h - fixes for typos that broke compiling (own error)
* transform.c - fix for implicit definition of a function (missing header)
* outliner.c - commented out a few unused vars (as a result of constraints refactor)
* editsima.c - fixed uninitialised var warning
* drawview.c - bugfix #7598 load without ui crashes if there is no camera. Patch provided by Daniel Genrich (genscher)
Diffstat (limited to 'source/blender/src/drawview.c')
-rw-r--r-- | source/blender/src/drawview.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 6752988d6f1..e437ad86cda 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1509,8 +1509,8 @@ static void draw_viewport_name(ScrArea *sa) name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Ortho" : "Top Ortho"; break; default: - if(G.vd->persp==V3D_PERSP_USE_THE_CAMERA) { - if (G.vd->camera->type == OB_CAMERA) { + if (G.vd->persp==V3D_PERSP_USE_THE_CAMERA) { + if ((G.vd->camera) && (G.vd->camera->type == OB_CAMERA)) { Camera *cam; cam = G.vd->camera->data; name = (cam->type != CAM_ORTHO) ? "Camera Persp" : "Camera Ortho"; |