[Bf-blender-cvs] [38cb2515dfd] soc-2018-npr: Fix snake mode reload.
Nick Wu
noreply at git.blender.org
Thu Jun 7 13:50:04 CEST 2018
Commit: 38cb2515dfd5a886130304340e728735e28cd5a0
Author: Nick Wu
Date: Thu Jun 7 19:49:39 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB38cb2515dfd5a886130304340e728735e28cd5a0
Fix snake mode reload.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 5c5f934b7f6..1aa0d56b7b6 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -321,7 +321,7 @@ static void lanpr_cache_finish(void *vedata){
DRW_shgroup_call_add(pd->dpix_preview_shgrp,bi->dpix_preview_batch,0);
}
- if(lanpr->reloaded){
+ if(lanpr->reloaded && lanpr->master_mode == LANPR_MASTER_MODE_DPIX){
GPU_texture_update(txl->dpix_in_pl,pd->atlas_pl);
GPU_texture_update(txl->dpix_in_pr,pd->atlas_pr);
GPU_texture_update(txl->dpix_in_nl,pd->atlas_nl);
diff --git a/source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry b/source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry
index d58d6aee819..f30451715db 100644
--- a/source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry
+++ b/source/blender/draw/engines/lanpr/shaders/lanpr_line_connection.geometry
@@ -1,5 +1,5 @@
layout (lines_adjacency) in;
-layout (triangle_strip, max_vertices = 6) out;
+layout (triangle_strip, max_vertices = 10000) out;
in vec2 gOffset[];
@@ -88,7 +88,7 @@ void main() {
EmitVertex();
gl_Position = c;
EmitVertex();
- EndPrimitive();
+ //EndPrimitive();
gl_Position = c;
EmitVertex();
@@ -96,5 +96,5 @@ void main() {
EmitVertex();
gl_Position = b;
EmitVertex();
- EndPrimitive();
+ //EndPrimitive();
}
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list