diff options
| author | YimingWu <xp8110@outlook.com> | 2020-05-16 18:08:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-05-16 18:08:40 +0300 |
| commit | cd54abd2c1316136753f7bbe227bd762a5f9e7d9 (patch) | |
| tree | 69f2a4a1a5013acc78213bb4f3fe888912380ea4 /source/blender/makesrna/intern/rna_texture.c | |
| parent | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (diff) | |
| parent | eaf7d36d66e551c3262d69f472b4028aeccb7e97 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/makesrna/intern/rna_texture.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 356ecd5b4db..46b8d8647de 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -25,12 +25,12 @@ #include "DNA_brush_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" -#include "DNA_object_types.h" -#include "DNA_texture_types.h" -#include "DNA_world_types.h" #include "DNA_node_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" /* MAXFRAME only */ +#include "DNA_texture_types.h" +#include "DNA_world_types.h" #include "BLI_utildefines.h" @@ -144,8 +144,8 @@ static const EnumPropertyItem blend_type_items[] = { # include "BKE_colorband.h" # include "BKE_context.h" # include "BKE_image.h" -# include "BKE_texture.h" # include "BKE_main.h" +# include "BKE_texture.h" # include "DEG_depsgraph.h" |