Merged revision(s) 58779, 58783-58784 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 21:49:10 +0000 (21:49 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 31 Jul 2013 21:49:10 +0000 (21:49 +0000)
intern/cycles/kernel/svm/svm_vector_transform.h
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
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 17dd72d4f3030b4f38aefd680ba35ca1cd317d0b..a0d56d14dcf987e9245608f21f308670276651ed 100644 (file)
@@ -35,8 +35,8 @@ __device void svm_node_vector_transform(KernelGlobals *kg, ShaderData *sd, float
        NodeVectorTransformConvertSpace to = (NodeVectorTransformConvertSpace)ito;
        
        Transform tfm;
-       int is_object = (sd->object != ~0);
-       int is_direction = (type == NODE_VECTOR_TRANSFORM_TYPE_VECTOR || type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL);
+       bool is_object = (sd->object != ~0);
+       bool is_direction = (type == NODE_VECTOR_TRANSFORM_TYPE_VECTOR || type == NODE_VECTOR_TRANSFORM_TYPE_NORMAL);
        
        /* From world */
        if(from == NODE_VECTOR_TRANSFORM_CONVERT_SPACE_WORLD) {
index 930715b4bc6fc88c46907932fe9e19423cc6b8e2..3ad0e18c8d737f7ff4059dcf92eb219e99849edc 100644 (file)
@@ -73,7 +73,7 @@ void  *BLI_ghash_lookup(GHash *gh, const void *key);
 bool   BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
 void   BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
 void  *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp);
-bool    BLI_ghash_haskey(GHash *gh, const void *key);
+bool   BLI_ghash_haskey(GHash *gh, const void *key);
 int    BLI_ghash_size(GHash *gh);
 
 /* *** */
index 10b3c01d2741c0ec14d140a8260d36aad3c993e1..14dfbcffebe5cb2ae89c27828f34bfc44c2ada80 100644 (file)
@@ -179,7 +179,8 @@ void BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfree
        gh->nentries = 0;
        gh->nbuckets = hashsizes[gh->cursize];
 
-       gh->buckets = MEM_recallocN(gh->buckets, gh->nbuckets * sizeof(*gh->buckets));
+       MEM_freeN(gh->buckets);
+       gh->buckets = MEM_callocN(gh->nbuckets * sizeof(*gh->buckets), "buckets");
 }
 
 /* same as above but return the value,
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;