Commit: b5da6a9126fc81d0fc961c3ac4b80c1d39378db8
Author: YimingWu
Date: Mon Jul 8 17:52:56 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb5da6a9126fc81d0fc961c3ac4b80c1d39378db8
LANPR: Fixing CPU mode camera view scale.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_ops.c
M
source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c
b/source/blender/draw/engines/lanpr/lanpr_ops.c
index efd46b71de6..5290e726e48 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4151,7 +4151,6 @@ void lanpr_software_draw_scene(void *vedata,
GPUFrameBuffer *dfb, int is_render)
camdx = rv3d->camdx;
camdy = rv3d->camdy;
camzoom = BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
- printf("%f %f %f", camdx,camdy,camzoom);
}else{
camdx = camdy = 0.0f;
camzoom = 1.0f;
diff --git
a/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
b/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
index 424461c1a51..c2648ecb620 100644
---
a/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
+++
b/source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
@@ -146,7 +146,7 @@ void main()
float asp1 = output_viewport.z / output_viewport.w;
float asp2 = preview_viewport.z / preview_viewport.w;
float x_scale = asp1 / asp2;
-
+
vec4 p1 = vec4(gl_in[0].gl_Position.xy, 0, 1);
vec4 p2 = vec4(gl_in[1].gl_Position.xy, 0, 1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
