remove unused headers and NULL check
authorCampbell Barton <ideasman42@gmail.com>
Wed, 31 Jul 2013 21:34:25 +0000 (21:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 31 Jul 2013 21:34:25 +0000 (21:34 +0000)
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_outliner_types.h
source/blender/makesdna/DNA_sound_types.h
source/blender/render/intern/source/voxeldata.c

index 947bf593310f28f33ef4b157088dc1154101d3bd..e37d1368892c0eefbbc37ee2551b808390c2f8d1 100644 (file)
@@ -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"
 
index 17124a724feb7bcee2b3b177c11b9f254a4388b7..5f9c90f09f740c906238f3d06c351c7bb82e26d0 100644 (file)
@@ -32,8 +32,6 @@
 #ifndef __DNA_OUTLINER_TYPES_H__
 #define __DNA_OUTLINER_TYPES_H__
 
-#include "DNA_listBase.h"
-
 struct ID;
 
 typedef struct TreeStoreElem {
index 6dc45e4a6de5e53f77eed47832bebaa99c49018e..040942d6cea239d7d34ba04c1a2bf3b3a9e4ff3f 100644 (file)
@@ -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 */
index 0aa1bcfef34dfed818688e91d782da79010c6ffc..3f19e77946c2c35239e6294bb1e28260fc291103 100644 (file)
@@ -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;