[Bf-blender-cvs] [a6e89c51516] greasepencil-object: Fix problem with fill_style

Antonio Vazquez noreply at git.blender.org
Wed Apr 12 12:37:20 CEST 2017


Commit: a6e89c515162c8295fd5de6ad36b17578d456cd5
Author: Antonio Vazquez
Date:   Wed Apr 12 12:36:45 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa6e89c515162c8295fd5de6ad36b17578d456cd5

Fix problem with fill_style

The different memory size of the variable corrupted mix_factor

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_mode.c

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c b/source/blender/draw/engines/gpencil/gpencil_mode.c
index 893939db58f..d31a6927af8 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -89,6 +89,7 @@ typedef struct GPENCIL_Data {
 typedef struct g_data{
 	int t_flip;
 	int t_mix;
+	int fill_style;
 } g_data; /* Transient data */
 
 static struct {
@@ -140,7 +141,8 @@ static DRWShadingGroup *GPENCIL_shgroup_fill_create(GPENCIL_Data *vedata, DRWPas
 	DRWShadingGroup *grp = DRW_shgroup_create(e_data.gpencil_fill_sh, pass);
 	DRW_shgroup_uniform_vec4(grp, "color", palcolor->fill, 1);
 	DRW_shgroup_uniform_vec4(grp, "color2", palcolor->scolor, 1);
-	DRW_shgroup_uniform_int(grp, "fill_type", &palcolor->fill_style, 1);
+	stl->g_data->fill_style = palcolor->fill_style;
+	DRW_shgroup_uniform_int(grp, "fill_type", &stl->g_data->fill_style, 1);
 	DRW_shgroup_uniform_float(grp, "mix_factor", &palcolor->mix_factor, 1);
 
 	DRW_shgroup_uniform_float(grp, "g_angle", &palcolor->g_angle, 1);




More information about the Bf-blender-cvs mailing list