[Bf-blender-cvs] [05db802421e] greasepencil-object: Merge branch 'master' into greasepencil-object
Antonioya
noreply at git.blender.org
Mon Apr 15 10:35:44 CEST 2019
Commit: 05db802421e6486ab1d978ab9e84ddb11f8c665b
Author: Antonioya
Date: Mon Apr 15 10:34:58 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB05db802421e6486ab1d978ab9e84ddb11f8c665b
Merge branch 'master' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/draw/engines/gpencil/gpencil_engine.h
index 0973877f65b,5d0d2397f8d..d8ffe65225a
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@@ -119,8 -119,8 +119,8 @@@ typedef struct GPENCIL_shgroup
int caps_mode[2];
float obj_scale;
int xray_mode;
-- int use_follow_path;
++ int use_follow_path;
float gradient_f;
float gradient_s[2];
More information about the Bf-blender-cvs
mailing list