Commit: dbd558d57400c3bc836c4e09cb91b8d8b7b8114e
Author: YimingWu
Date: Fri Jul 26 12:20:52 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBdbd558d57400c3bc836c4e09cb91b8d8b7b8114e
LANPR: Fixed drawing problems when chaining is enabled.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_cpu.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c
b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 63661491cb0..d00f4d30591 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -382,13 +382,13 @@ void lanpr_software_draw_scene(void *vedata,
GPUFrameBuffer *dfb, int is_render)
ll->use_same_style ? &unit_thickness :
&ll->intersection.thickness,
1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "contour.enabled",
&ll->contour.enabled, 1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "crease.enabled",
&ll->crease.enabled, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_contour",
&ll->contour.enabled, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_crease",
&ll->crease.enabled, 1);
DRW_shgroup_uniform_int(
rb->ChainShgrp, "enable_material", &ll->material_separate.enabled,
1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "edge_mark.enabled",
&ll->edge_mark.enabled, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp, "enable_edge_mark",
&ll->edge_mark.enabled, 1);
DRW_shgroup_uniform_int(
- rb->ChainShgrp, "intersection.enabled", &ll->intersection.enabled,
1);
+ rb->ChainShgrp, "enable_intersection", &ll->intersection.enabled,
1);
DRW_shgroup_uniform_int(rb->ChainShgrp, "normal_mode",
&ll->normal_mode, 1);
DRW_shgroup_uniform_int(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs