[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58785] branches/soc-2013-dingto: Merged revision(s) 58779, 58783-58784 from trunk/ blender into soc-2013-dingto.

[Thomas Dinges]

Revision: 58785
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58785
Author:   dingto
Date:     2013-07-31 21:49:10 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Merged revision(s) 58779, 58783-58784 from trunk/blender into soc-2013-dingto.

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_vector_transform.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2013-dingto/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2013-dingto/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2013-dingto/source/blender/render/intern/source/voxeldata.c

Property Changed:
----------------
    branches/soc-2013-dingto/


Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58784

Modified: branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_vector_transform.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_vector_transform.h	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_vector_transform.h	2013-07-31 21:49:10 UTC (rev 58785)
@@ -35,8 +35,8 @@
 	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) {

Modified: branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h	2013-07-31 21:49:10 UTC (rev 58785)
@@ -73,7 +73,7 @@
 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);
 
 /* *** */

Modified: branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c	2013-07-31 21:49:10 UTC (rev 58785)
@@ -179,7 +179,8 @@
 	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,

Modified: branches/soc-2013-dingto/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- branches/soc-2013-dingto/source/blender/makesdna/DNA_mesh_types.h	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/makesdna/DNA_mesh_types.h	2013-07-31 21:49:10 UTC (rev 58785)
@@ -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"
 

Modified: branches/soc-2013-dingto/source/blender/makesdna/DNA_outliner_types.h
===================================================================
--- branches/soc-2013-dingto/source/blender/makesdna/DNA_outliner_types.h	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/makesdna/DNA_outliner_types.h	2013-07-31 21:49:10 UTC (rev 58785)
@@ -32,8 +32,6 @@
 #ifndef __DNA_OUTLINER_TYPES_H__
 #define __DNA_OUTLINER_TYPES_H__
 
-#include "DNA_listBase.h"
-
 struct ID;
 
 typedef struct TreeStoreElem {

Modified: branches/soc-2013-dingto/source/blender/makesdna/DNA_sound_types.h
===================================================================
--- branches/soc-2013-dingto/source/blender/makesdna/DNA_sound_types.h	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/makesdna/DNA_sound_types.h	2013-07-31 21:49:10 UTC (rev 58785)
@@ -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 */

Modified: branches/soc-2013-dingto/source/blender/render/intern/source/voxeldata.c
===================================================================
--- branches/soc-2013-dingto/source/blender/render/intern/source/voxeldata.c	2013-07-31 21:40:52 UTC (rev 58784)
+++ branches/soc-2013-dingto/source/blender/render/intern/source/voxeldata.c	2013-07-31 21:49:10 UTC (rev 58785)
@@ -156,7 +156,7 @@
 	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;