Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-03-09 18:27:24 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-03-09 18:27:24 +0300
commit29f3af95272590d26f610ae828b2eeee89c82a00 (patch)
treea696a58a2561c48f7ec6166e369e22081e0a64d8 /source/blender/makesdna/DNA_shader_fx_types.h
parentdcb93126876879d969a30a7865700abd072066f8 (diff)
GPencil: Refactor of Draw Engine, Vertex Paint and all internal functions
This commit is a full refactor of the grease pencil modules including Draw Engine, Modifiers, VFX, depsgraph update, improvements in operators and conversion of Sculpt and Weight paint tools to real brushes. Also, a huge code cleanup has been done at all levels. Thanks to @fclem for his work and yo @pepeland and @mendio for the testing and help in the development. Differential Revision: https://developer.blender.org/D6293
Diffstat (limited to 'source/blender/makesdna/DNA_shader_fx_types.h')
-rw-r--r--source/blender/makesdna/DNA_shader_fx_types.h37
1 files changed, 12 insertions, 25 deletions
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index 6cda58a3279..e0931d8cac3 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -34,7 +34,7 @@ typedef enum ShaderFxType {
eShaderFxType_None = 0,
eShaderFxType_Blur = 1,
eShaderFxType_Flip = 2,
- eShaderFxType_Light = 3,
+ eShaderFxType_Light_deprecated = 3, /* DEPRECATED (replaced by scene lights) */
eShaderFxType_Pixel = 4,
eShaderFxType_Swirl = 5,
eShaderFxType_Wave = 6,
@@ -81,15 +81,13 @@ typedef struct ShaderFxData_Runtime {
typedef struct BlurShaderFxData {
ShaderFxData shaderfx;
- int radius[2];
+ float radius[2];
/** Flags. */
int flag;
/** Number of samples. */
int samples;
- /** Circle of confusion. */
- float coc;
- /** Not visible in rna. */
- int blur[2];
+ /** Rotation of blur effect. */
+ float rotation;
char _pad[4];
ShaderFxData_Runtime runtime;
@@ -136,14 +134,20 @@ typedef enum eFlipShaderFx_Flag {
typedef struct GlowShaderFxData {
ShaderFxData shaderfx;
- float glow_color[3];
+ float glow_color[4];
float select_color[3];
float threshold;
/** Flags. */
int flag;
int mode;
- int blur[2];
+ float blur[2];
int samples;
+ /** Rotation of effect. */
+ float rotation;
+ /** Blend modes. */
+ int blend_mode;
+ char _pad[4];
+
ShaderFxData_Runtime runtime;
} GlowShaderFxData;
@@ -156,19 +160,6 @@ typedef enum eGlowShaderFx_Flag {
FX_GLOW_USE_ALPHA = (1 << 0),
} eGlowShaderFx_Flag;
-typedef struct LightShaderFxData {
- ShaderFxData shaderfx;
- struct Object *object;
- /** Flags. */
- int flag;
- float energy;
- float ambient;
- /** Internal, not visible in rna. */
- float loc[4];
- char _pad[4];
- ShaderFxData_Runtime runtime;
-} LightShaderFxData;
-
typedef struct PixelShaderFxData {
ShaderFxData shaderfx;
/** Last element used for shader only. */
@@ -179,10 +170,6 @@ typedef struct PixelShaderFxData {
ShaderFxData_Runtime runtime;
} PixelShaderFxData;
-typedef enum ePixelShaderFx_Flag {
- FX_PIXEL_USE_LINES = (1 << 0),
-} ePixelShaderFx_Flag;
-
typedef struct RimShaderFxData {
ShaderFxData shaderfx;
int offset[2];