Commit: 5662864e5b5f70432324d7ec0fcdf9b6054b5c2f
Author: Lukas Tönne
Date: Wed Jan 21 14:05:35 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB5662864e5b5f70432324d7ec0fcdf9b6054b5c2f
Merge branch 'master' into gooseberry
===================================================================
===================================================================
diff --cc source/blender/editors/space_node/drawnode.c
index 58ca9d0,870b463..448c2f8
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -3053,12 -3053,10 +3053,10 @@@ void draw_nodespace_back_pix(const bCon
/* somehow the offset has to be calculated inverse */
glaDefine2DArea(&ar->winrct);
- /* ortho at pixel level curarea */
- /* almost #wmOrtho2_region_pixelspace, but no +1 px */
- wmOrtho2_pixelspace(ar->winx, ar->winy);
+ wmOrtho2_region_pixelspace(ar);
- x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof;
- y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof;
+ x = (ar->winx - snode->backdrop_zoom * ibuf->x) / 2 +
snode->backdrop_offset[0];
+ y = (ar->winy - snode->backdrop_zoom * ibuf->y) / 2 +
snode->backdrop_offset[1];
if (ibuf->rect || ibuf->rect_float) {
unsigned char *display_buffer = NULL;
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 29d05ab,88cabcc..2be3f39
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -3641,8 -3584,10 +3641,9 @@@ void view3d_main_area_draw(const bConte
#ifdef DEBUG_DRAW
bl_debug_draw();
#endif
- draw_sim_debug_data(scene, v3d, ar);
+ if (G.debug & G_DEBUG_SIMDATA)
+ draw_sim_debug_data(scene, v3d, ar);
- ED_region_pixelspace(ar);
}
/* draw viewport using external renderer */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
