diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
commit | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (patch) | |
tree | d9fb7e477ac551859ca95c1f0482eca8b3af1077 /source/blender/makesrna | |
parent | 72d0cc1f6123900f5593cd0fe428568f5aa7f682 (diff) | |
parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (diff) |
svn merge ^/trunk/blender -r55815:55840
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_movieclip.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 1bf15fd0838..74b0f69c9b8 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -27,9 +27,6 @@ #include <stdlib.h> #include <limits.h> -#include "BKE_cloth.h" -#include "BKE_modifier.h" - #include "DNA_cloth_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -38,6 +35,9 @@ #include "rna_internal.h" +#include "BKE_cloth.h" +#include "BKE_modifier.h" + #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 09ea82e5ec7..e7a8311656f 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -27,12 +27,12 @@ #ifndef __RNA_INTERNAL_H__ #define __RNA_INTERNAL_H__ -#include "UI_resources.h" - #include "BLI_utildefines.h" #include "rna_internal_types.h" +#include "UI_resources.h" + #define RNA_MAGIC ((int)~0) struct ColorBand; diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 9b2bcab4604..bb5ff172672 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -30,9 +30,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_movieclip.h" -#include "BKE_tracking.h" - #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" @@ -40,6 +37,9 @@ #include "rna_internal.h" +#include "BKE_movieclip.h" +#include "BKE_tracking.h" + #include "WM_types.h" #include "IMB_imbuf_types.h" |