sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Small fix: the compositing "Preview" option in UV/Image editor should only

Browse Source 
work when compositing output is shown.
This commit is contained in:
Ton Roosendaal 2006-06-10 15:18:47 +00:00
parent 29d393eb1f
commit 3d47bb56fa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/drawimage.c
View File

@ -65,6 +65,7 @@
#include "BKE_colortools.h"
#include "BKE_utildefines.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_mesh.h"
#include "BKE_node.h"
@ -151,13 +152,17 @@ static void setcloneimage()
static int image_preview_active(ScrArea *sa, float *xim, float *yim)
{
SpaceImage *sima= sa->spacedata.first;
short a;
for(a=0; a<SPACE_MAXHANDLER; a+=2) {
if(sima->blockhandler[a] == IMAGE_HANDLER_PREVIEW) {
if(xim) *xim= (G.scene->r.size*G.scene->r.xsch)/100;
if(yim) *yim= (G.scene->r.size*G.scene->r.ysch)/100;
return 1;
/* only when compositor shows, and image handler set */
if(sima->image == (Image *)find_id("IM", "Compositor")) {
short a;
for(a=0; a<SPACE_MAXHANDLER; a+=2) {
if(sima->blockhandler[a] == IMAGE_HANDLER_PREVIEW) {
if(xim) *xim= (G.scene->r.size*G.scene->r.xsch)/100;
if(yim) *yim= (G.scene->r.size*G.scene->r.ysch)/100;
return 1;
}
}
}
return 0;