diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:16:41 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-01 15:16:41 +0300 |
commit | 936d1cef6e6124a8f8f3ce50182afa2e1c947c6f (patch) | |
tree | 429a7503472bd8fe38ceb062086e447cb3a83423 /source/blender/makesrna/RNA_access.h | |
parent | 4e6bcd10e559ab541df53a3d7b645faac1a7fe27 (diff) | |
parent | ddd62f1b1063d69df5171c7b3457ffcffcc6b0e4 (diff) |
Merge branch 'blender2.8' into soc-2018-bevel
Conflicts:
release/scripts/addons
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/space_outliner/outliner_draw.c
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 8c57cb2ce42..8036f9edaa7 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -269,9 +269,6 @@ extern StructRNA RNA_FreestyleSettings; extern StructRNA RNA_Function; extern StructRNA RNA_GPencilFrame; extern StructRNA RNA_GPencilLayer; -extern StructRNA RNA_GPencilPalette; -extern StructRNA RNA_GPencilPaletteColor; -extern StructRNA RNA_GPencilBrush; extern StructRNA RNA_GPencilInterpolateSettings; extern StructRNA RNA_GPencilStroke; extern StructRNA RNA_GPencilStrokePoint; @@ -600,6 +597,31 @@ extern StructRNA RNA_SunLight; extern StructRNA RNA_SurfaceCurve; extern StructRNA RNA_SurfaceDeformModifier; extern StructRNA RNA_SurfaceModifier; +extern StructRNA RNA_GpencilModifier; +extern StructRNA RNA_BuildGpencilModifier; +extern StructRNA RNA_NoiseGpencilModifier; +extern StructRNA RNA_SubdivGpencilModifier; +extern StructRNA RNA_SimplifyGpencilModifier; +extern StructRNA RNA_ThickGpencilModifier; +extern StructRNA RNA_TintGpencilModifier; +extern StructRNA RNA_ColorGpencilModifier; +extern StructRNA RNA_InstanceGpencilModifier; +extern StructRNA RNA_DupliGpencilModifier; +extern StructRNA RNA_OpacityGpencilModifier; +extern StructRNA RNA_LatticeGpencilModifier; +extern StructRNA RNA_MirrorGpencilModifier; +extern StructRNA RNA_SmoothGpencilModifier; +extern StructRNA RNA_HookGpencilModifier; +extern StructRNA RNA_OffsetGpencilModifier; +extern StructRNA RNA_ShaderFx; +extern StructRNA RNA_ShaderFxBlur; +extern StructRNA RNA_ShaderFxColorize; +extern StructRNA RNA_ShaderFxFlip; +extern StructRNA RNA_ShaderFxLight; +extern StructRNA RNA_ShaderFxPixel; +extern StructRNA RNA_ShaderFxRim; +extern StructRNA RNA_ShaderFxSwirl; +extern StructRNA RNA_ShaderFxWave; extern StructRNA RNA_TexMapping; extern StructRNA RNA_Text; extern StructRNA RNA_TextBox; @@ -801,7 +823,7 @@ bool RNA_struct_bl_idname_ok_or_report(struct ReportList *reports, const char *i /* Property Information */ -const char *RNA_property_identifier(PropertyRNA *prop); +const char *RNA_property_identifier(const PropertyRNA *prop); const char *RNA_property_description(PropertyRNA *prop); PropertyType RNA_property_type(PropertyRNA *prop); |