diff options
| author | Jacques Lucke <mail@jlucke.com> | 2020-02-10 14:01:07 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2020-02-10 14:01:07 +0300 |
| commit | 605928c15b0748068137c620e1894112b838baf2 (patch) | |
| tree | cbd28ef62574175de2d551336cc16d0bf2748eb4 /source/blender/makesrna/RNA_access.h | |
| parent | 9880bebd1a9a6262b16635bfeb7b003ea3ec0a9b (diff) | |
| parent | 795c4a3462536d1e780b227d6877a8693f656cf9 (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index f8e78e9c8fc..063bdc30fd6 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -261,7 +261,11 @@ extern StructRNA RNA_FileBrowserFSMenuEntry; extern StructRNA RNA_FileSelectParams; extern StructRNA RNA_FloatProperty; extern StructRNA RNA_FloorConstraint; +extern StructRNA RNA_FluidDomainSettings; +extern StructRNA RNA_FluidEffectorSettings; +extern StructRNA RNA_FluidFlowSettings; extern StructRNA RNA_FluidFluidSettings; +extern StructRNA RNA_FluidModifier; extern StructRNA RNA_FluidSettings; extern StructRNA RNA_FollowPathConstraint; extern StructRNA RNA_FreestyleLineSet; @@ -596,10 +600,6 @@ extern StructRNA RNA_ShrinkwrapModifier; extern StructRNA RNA_SimpleDeformModifier; extern StructRNA RNA_SimplifyGpencilModifier; extern StructRNA RNA_SkinModifier; -extern StructRNA RNA_FluidEffectorSettings; -extern StructRNA RNA_FluidDomainSettings; -extern StructRNA RNA_FluidFlowSettings; -extern StructRNA RNA_FluidModifier; extern StructRNA RNA_SmoothGpencilModifier; extern StructRNA RNA_SmoothModifier; extern StructRNA RNA_SoftBodyModifier; @@ -737,11 +737,11 @@ extern StructRNA RNA_WalkNavigation; extern StructRNA RNA_WarpModifier; extern StructRNA RNA_WaveModifier; extern StructRNA RNA_WeightedNormalModifier; +extern StructRNA RNA_WeldModifier; extern StructRNA RNA_Window; extern StructRNA RNA_WindowManager; extern StructRNA RNA_WipeSequence; extern StructRNA RNA_WireframeModifier; -extern StructRNA RNA_WeldModifier; extern StructRNA RNA_WoodTexture; extern StructRNA RNA_WorkSpace; extern StructRNA RNA_World; |