[Bf-blender-cvs] [f28dd2c944e] blender2.8: Cleanup: capitalize runtime in struct name
Campbell Barton
noreply at git.blender.org
Fri Oct 5 09:21:24 CEST 2018
Commit: f28dd2c944e399694f416820c8ab88c9516d6636
Author: Campbell Barton
Date: Fri Oct 5 17:20:23 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBf28dd2c944e399694f416820c8ab88c9516d6636
Cleanup: capitalize runtime in struct name
===================================================================
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_shader_fx_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index b9df4137862..2a79880f221 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -139,7 +139,7 @@ typedef enum eGPDpalette_Flag {
/* GP Strokes */
/* Runtime temp data for bGPDstroke */
-typedef struct bGPDstroke_runtime {
+typedef struct bGPDstroke_Runtime {
/* runtime final colors (result of original colors and modifiers) */
float tmp_stroke_rgba[4];
float tmp_fill_rgba[4];
@@ -148,7 +148,7 @@ typedef struct bGPDstroke_runtime {
char tmp_layerinfo[128];
float multi_frame_falloff; /* runtime falloff factor (only for transform) */
-} bGPDstroke_runtime;
+} bGPDstroke_Runtime;
/* Grease-Pencil Annotations - 'Stroke'
* -> A stroke represents a (simplified version) of the curve
@@ -174,7 +174,7 @@ typedef struct bGPDstroke {
struct MDeformVert *dvert; /* vertex weight data */
- bGPDstroke_runtime runtime;
+ bGPDstroke_Runtime runtime;
char pad_1[4];
} bGPDstroke;
@@ -202,9 +202,9 @@ typedef enum eGPDstroke_Flag {
/* GP Frame */
/* Runtime temp data for bGPDframe */
-typedef struct bGPDframe_runtime {
+typedef struct bGPDframe_Runtime {
float viewmatrix[4][4]; /* parent matrix for drawing */
-} bGPDframe_runtime;
+} bGPDframe_Runtime;
/* Grease-Pencil Annotations - 'Frame'
* -> Acts as storage for the 'image' formed by strokes
@@ -219,7 +219,7 @@ typedef struct bGPDframe {
short flag; /* temp settings */
short key_type; /* keyframe type (eBezTriple_KeyframeType) */
- bGPDframe_runtime runtime;
+ bGPDframe_Runtime runtime;
} bGPDframe;
/* bGPDframe->flag */
@@ -234,11 +234,11 @@ typedef enum eGPDframe_Flag {
/* GP Layer */
/* Runtime temp data for bGPDlayer */
-typedef struct bGPDlayer_runtime {
+typedef struct bGPDlayer_Runtime {
struct GHash *derived_data; /* runtime data created by modifiers */
int icon_id; /* id for dynamic icon used to show annotation color preview for layer */
int batch_index; /* batch used for dupli instances */
-} bGPDlayer_runtime;
+} bGPDlayer_Runtime;
/* Grease-Pencil Annotations - 'Layer' */
typedef struct bGPDlayer {
@@ -268,7 +268,7 @@ typedef struct bGPDlayer {
float tintcolor[4]; /* Color used to tint layer, alpha value is used as factor */
float opacity; /* Opacity of the layer */
- bGPDlayer_runtime runtime;
+ bGPDlayer_Runtime runtime;
} bGPDlayer;
/* bGPDlayer->flag */
@@ -303,7 +303,7 @@ typedef enum eGPDlayer_OnionFlag {
/* GP Datablock */
/* Runtime temp data for bGPdata */
-typedef struct bGPdata_runtime {
+typedef struct bGPdata_Runtime {
/* Drawing Manager cache */
struct GHash *batch_cache_data;
void *sbuffer; /* stroke buffer (can hold GP_STROKE_BUFFER_MAX) */
@@ -322,7 +322,7 @@ typedef struct bGPdata_runtime {
short sbuffer_size; /* number of elements currently in cache */
short sbuffer_sflag; /* flags for stroke that cache represents */
char pad_[6];
-} bGPdata_runtime;
+} bGPdata_Runtime;
/* grid configuration */
typedef struct bGPgrid {
@@ -375,7 +375,8 @@ typedef struct bGPdata {
int totpoint;
char pad_3[4];
bGPgrid grid;
- bGPdata_runtime runtime;
+
+ bGPdata_Runtime runtime;
} bGPdata;
/* bGPdata->flag */
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index 8c124b8837a..3884f72fb56 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -73,11 +73,11 @@ typedef struct ShaderFxData {
} ShaderFxData;
/* Runtime temp data */
-typedef struct ShaderFxData_runtime {
+typedef struct ShaderFxData_Runtime {
struct DRWShadingGroup *fx_sh;
struct DRWShadingGroup *fx_sh_b;
struct DRWShadingGroup *fx_sh_c;
-} ShaderFxData_runtime;
+} ShaderFxData_Runtime;
typedef struct BlurShaderFxData {
ShaderFxData shaderfx;
@@ -87,7 +87,8 @@ typedef struct BlurShaderFxData {
float coc; /* circle of confusion */
int blur[2]; /* not visible in rna */
char pad[4];
- ShaderFxData_runtime runtime;
+
+ ShaderFxData_Runtime runtime;
} BlurShaderFxData;
typedef enum eBlurShaderFx_Flag {
@@ -102,7 +103,8 @@ typedef struct ColorizeShaderFxData {
float factor;
int flag; /* flags */
char pad[4];
- ShaderFxData_runtime runtime;
+
+ ShaderFxData_Runtime runtime;
} ColorizeShaderFxData;
typedef enum ColorizeShaderFxModes {
@@ -117,7 +119,7 @@ typedef struct FlipShaderFxData {
ShaderFxData shaderfx;
int flag; /* flags */
int flipmode; /* internal, not visible in rna */
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} FlipShaderFxData;
typedef enum eFlipShaderFx_Flag {
@@ -133,7 +135,7 @@ typedef struct LightShaderFxData {
float ambient;
float loc[4]; /* internal, not visible in rna */
char pad[4];
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} LightShaderFxData;
typedef struct PixelShaderFxData {
@@ -141,7 +143,7 @@ typedef struct PixelShaderFxData {
int size[3]; /* last element used for shader only */
int flag; /* flags */
float rgba[4];
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} PixelShaderFxData;
typedef enum ePixelShaderFx_Flag {
@@ -158,7 +160,7 @@ typedef struct RimShaderFxData {
int blur[2];
int samples;
char pad[4];
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} RimShaderFxData;
typedef enum RimShaderFxModes {
@@ -185,7 +187,7 @@ typedef struct ShadowShaderFxData {
int blur[2];
int samples;
char pad[4];
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} ShadowShaderFxData;
typedef enum eShadowShaderFx_Flag {
@@ -200,7 +202,7 @@ typedef struct SwirlShaderFxData {
int radius;
float angle;
int transparent; /* not visible in rna */
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} SwirlShaderFxData;
typedef enum eSwirlShaderFx_Flag {
@@ -215,6 +217,6 @@ typedef struct WaveShaderFxData {
int orientation;
int flag; /* flags */
char pad[4];
- ShaderFxData_runtime runtime;
+ ShaderFxData_Runtime runtime;
} WaveShaderFxData;
#endif /* __DNA_SHADER_FX_TYPES_H__ */
More information about the Bf-blender-cvs
mailing list