diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-01 01:34:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-01 01:34:25 +0400 |
commit | 7913604bdae8c86b7c0b29fa0cb629db33e433f5 (patch) | |
tree | 2d68075435eeff439c7acaae6f3542f09fa65d5b /source/blender | |
parent | 2a2f0319bc1e9c16331f356730a1edb837f4056b (diff) |
remove unused headers and NULL check
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 2 |
4 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 947bf593310..e37d1368892 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -33,7 +33,6 @@ #define __DNA_MESH_TYPES_H__ #include "DNA_defs.h" -#include "DNA_listBase.h" #include "DNA_ID.h" #include "DNA_customdata_types.h" diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index 17124a724fe..5f9c90f09f7 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -32,8 +32,6 @@ #ifndef __DNA_OUTLINER_TYPES_H__ #define __DNA_OUTLINER_TYPES_H__ -#include "DNA_listBase.h" - struct ID; typedef struct TreeStoreElem { diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 6dc45e4a6de..040942d6cea 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -33,7 +33,6 @@ #ifndef __DNA_SOUND_TYPES_H__ #define __DNA_SOUND_TYPES_H__ -#include "DNA_listBase.h" #include "DNA_ID.h" /* stupid... could easily be solved */ diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 0aa1bcfef34..3f19e77946c 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -156,7 +156,7 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex) int x = 0, y = 0, z = 0; float *rf; - if (!ima || !tiuser) return; + if (!ima) return; if (iuser.frames == 0) return; ima->source = IMA_SRC_SEQUENCE; |