griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #4741

Browse Source 
Ancient issue; when you press keypad-0, it should assign the active camera
object to a scene, but this did not happen when that camera was already
assigned to the active 3d view. A rare case, causing 'error no camera' on
a render.
This commit is contained in:
Ton Roosendaal
2006-07-20 10:36:55 +00:00
parent 60f3a33855
commit 0128c401b9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/toets.c
View File

@@ -259,8 +259,9 @@ void persptoetsen(unsigned short event)
handle_view3d_lock();
}
else if(BASACT) {
/* check both G.vd as G.scene cameras */
if(G.qual==LR_CTRLKEY) {
if(G.vd->camera != OBACT) {
if(G.vd->camera != OBACT || G.scene->camera != OBACT) {
if(G.vd->camera && G.vd->camera->type==OB_CAMERA)
oldcamera= G.vd->camera;
@@ -268,7 +269,7 @@ void persptoetsen(unsigned short event)
handle_view3d_lock();
}
}
else if(G.vd->camera==0 && OBACT->type==OB_CAMERA) {
else if((G.vd->camera==NULL || G.scene->camera==NULL) && OBACT->type==OB_CAMERA) {
G.vd->camera= OBACT;
handle_view3d_lock();
}