Revision: 26705
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26705
Author: blendix
Date: 2010-02-08 14:55:31 +0100 (Mon, 08 Feb 2010)
Log Message:
-----------
Warning fixes, one actual bug found in sequencer sound wave drawing. Also
changed some malloc to MEM_mallocN while trying to track down a memory leak.
Modified Paths:
--------------
trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/intern/smoke/intern/FLUID_3D.cpp
trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
trunk/blender/source/blender/blenkernel/BKE_fcurve.h
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/exotic.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/imbuf/intern/iff.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/render/intern/source/voxeldata.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp 2010-02-08
13:55:31 UTC (rev 26705)
@@ -78,7 +78,7 @@
else
{
sample_t* buf = m_buffer->getBuffer();
- float volume;
+ float volume = 1.0f;
for(int i = 0; i < length * specs.channels; i++)
{
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===================================================================
--- trunk/blender/intern/opennl/superlu/get_perm_c.c 2010-02-08 12:37:09 UTC
(rev 26704)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c 2010-02-08 13:55:31 UTC
(rev 26705)
@@ -409,6 +409,7 @@
return;
default:
ABORT("Invalid ISPEC");
+ return;
}
if ( bnz != 0 ) {
Modified: trunk/blender/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2010-02-08 12:37:09 UTC
(rev 26704)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2010-02-08 13:55:31 UTC
(rev 26705)
@@ -204,16 +204,13 @@
//////////////////////////////////////////////////////////////////////
void FLUID_3D::step()
{
-
- int threadval = 1;
#if PARALLEL==1
+ int threadval = 1;
threadval = omp_get_max_threads();
-#endif
int stepParts = 1;
float partSize = _zRes;
-#if PARALLEL==1
stepParts = threadval*2; // Dividing parallelized sections into
numOfThreads * 2 sections
partSize = (float)_zRes/stepParts; // Size of one part;
@@ -935,7 +932,6 @@
float *_xVorticity, *_yVorticity, *_zVorticity, *_vorticity;
- int _vIndex = _slabSize + _xRes + 1;
int bb=0;
int bt=0;
int bb1=-1;
Modified: trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp 2010-02-08
13:55:31 UTC (rev 26705)
@@ -57,7 +57,6 @@
float xTotal = dx * res[0];
float yTotal = dx * res[1];
- float zTotal = dx * res[2];
float heighMin = 0.05;
float heighMax = 0.10;
@@ -408,11 +407,11 @@
void FLUID_3D::advectFieldMacCormack1(const float dt, const float* xVelocity,
const float* yVelocity, const float* zVelocity,
float* oldField, float* tempResult, Vec3Int
res, int zBegin, int zEnd)
{
- const int sx= res[0];
+ /*const int sx= res[0];
const int sy= res[1];
const int sz= res[2];
- /*for (int x = 0; x < sx * sy * sz; x++)
+ for (int x = 0; x < sx * sy * sz; x++)
phiHatN[x] = phiHatN1[x] = oldField[x];*/ // not needed
as all the values are written first
float*& phiN = oldField;
@@ -433,7 +432,6 @@
float* t1 = temp1;
const int sx= res[0];
const int sy= res[1];
- const int sz= res[2];
float*& phiN = oldField;
float*& phiN1 = newField;
Modified: trunk/blender/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_fcurve.h 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/BKE_fcurve.h 2010-02-08
13:55:31 UTC (rev 26705)
@@ -34,6 +34,7 @@
struct DriverVar;
struct DriverTarget;
+struct bAction;
struct BezTriple;
struct StructRNA;
struct PointerRNA;
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2010-02-08
13:55:31 UTC (rev 26705)
@@ -313,6 +313,7 @@
* See Bridson et al. "Robust Treatment of Collision, Contact and Friction for
Cloth Animation"
* page 4, left column
*/
+#if 0
static int cloth_get_collision_time ( double a[3], double b[3], double c[3],
double d[3], double e[3], double f[3], double solution[3] )
{
int num_sols = 0;
@@ -424,6 +425,7 @@
return num_sols;
}
+#endif
// w3 is not perfect
@@ -837,6 +839,7 @@
}
#endif
+#if 0
static float projectPointOntoLine(float *p, float *a, float *b)
{
float ba[3], pa[3];
@@ -1067,7 +1070,6 @@
return 0;
}
-#if 0
static int cloth_collision_moving_edges ( ClothModifierData *clmd,
CollisionModifierData *collmd, CollPair *collpair )
{
EdgeCollPair edgecollpair;
Modified: trunk/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/exotic.c 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/intern/exotic.c 2010-02-08
13:55:31 UTC (rev 26705)
@@ -37,6 +37,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <string.h>
+#include <errno.h>
#ifndef _WIN32
#include <unistd.h>
@@ -76,8 +77,8 @@
#include "BKE_object.h"
#include "BKE_material.h"
#include "BKE_exotic.h"
+#include "BKE_report.h"
-/* #include "BKE_error.h" */
#include "BKE_screen.h"
#include "BKE_displist.h"
#include "BKE_DerivedMesh.h"
@@ -205,18 +206,31 @@
unsigned int numfacets = 0, i, j, vertnum;
unsigned int maxmeshsize, nummesh, lastmeshsize;
unsigned int totvert, totface;
+ ReportList *reports= NULL; /* XXX */
fpSTL= fopen(str, "rb");
if(fpSTL==NULL) {
- //XXX error("Can't read file");
+ BKE_reportf(reports, RPT_ERROR, "Can't read file: %s.",
strerror(errno));
return;
}
- fseek(fpSTL, 80, SEEK_SET);
- fread(&numfacets, 4*sizeof(char), 1, fpSTL);
+ if(fseek(fpSTL, 80, SEEK_SET) != 0) {
+ BKE_reportf(reports, RPT_ERROR, "Failed reading file: %s.",
strerror(errno));
+ fclose(fpSTL);
+ return;
+ }
+
+ if(fread(&numfacets, 4*sizeof(char), 1, fpSTL) != 1) {
+ if(feof(fpSTL))
+ BKE_reportf(reports, RPT_ERROR, "Failed reading file:
premature end of file.");
+ else
+ BKE_reportf(reports, RPT_ERROR, "Failed reading file:
%s.", strerror(errno));
+ fclose(fpSTL);
+ return;
+ }
if (ENDIAN_ORDER==B_ENDIAN) {
- SWITCH_INT(numfacets);
- }
+ SWITCH_INT(numfacets);
+ }
maxmeshsize = MESH_MAX_VERTS/3;
@@ -318,13 +332,14 @@
unsigned int numtenthousand, linenum;
unsigned int i, vertnum;
unsigned int totvert, totface;
+ ReportList *reports= NULL; /* XXX */
/* ASCII stl sucks ... we don't really know how many faces there
are until the file is done, so lets allocate faces 10000 at a time */
fpSTL= fopen(str, "r");
if(fpSTL==NULL) {
- //XXX error("Can't read file");
+ BKE_reportf(reports, RPT_ERROR, "Can't read file: %s.",
strerror(errno));
return;
}
@@ -634,6 +649,7 @@
int file, filelen, count, lll, face, nr = 0;
int skipdata, ok, a, b, tot, first, colnr, coordtype, polytype, *idata;
struct DispList *dl;
+ ReportList *reports= NULL; /* XXX */
ivbase.first= ivbase.last= 0;
iv_curcol= 0;
@@ -641,7 +657,7 @@
file= open(str, O_BINARY|O_RDONLY);
if(file== -1) {
- //XXX error("Can't read file\n");
+ BKE_reportf(reports, RPT_ERROR, "Can't read file: %s.",
strerror(errno));
return;
}
@@ -652,7 +668,11 @@
}
maindata= MEM_mallocN(filelen, "leesInventor");
- read(file, maindata, filelen);
+ if(read(file, maindata, filelen) < filelen) {
+ BKE_reportf(reports, RPT_ERROR, "Failed reading file: premature
end of file.");
+ close(file);
+ return;
+ }
close(file);
iv_data_stack= MEM_mallocN(sizeof(float)*IV_MAXSTACK, "ivstack");
@@ -1895,6 +1915,7 @@
Base *base;
FILE *fpSTL;
int numfacets = 0;
+ ReportList *reports= NULL; /* XXX */
if(BLI_testextensie(str,".blend")) str[ strlen(str)-6]= 0;
if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0;
@@ -1908,7 +1929,7 @@
fpSTL= fopen(str, "wb");
if(fpSTL==NULL) {
- //XXX error("Can't write file");
+ BKE_reportf(reports, RPT_ERROR, "Can't open file: %s.",
strerror(errno));
return;
}
strcpy(temp_dir, str);
@@ -3388,7 +3409,7 @@
/* Blender vars */
Object *ob;
Mesh *me;
- float vert[3];
+ float vert[3] = {0};
MVert *mvert, *vtmp;
MFace *mface, *ftmp;
@@ -3613,7 +3634,7 @@
/* Blender vars */
Object *ob;
Mesh *me;
- float vert[3];
+ float vert[3] = {0};
MVert *mvert;
MFace *mface;
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2010-02-08
13:55:31 UTC (rev 26705)
@@ -2872,7 +2872,7 @@
static int node_animation_properties(bNodeTree *ntree, bNode *node)
{
bNodeSocket *sock;
- ListBase *lb;
+ const ListBase *lb;
Link *link;
PointerRNA ptr;
PropertyRNA *prop;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2010-02-08
13:55:31 UTC (rev 26705)
@@ -2864,7 +2864,7 @@
/* or heun ~ 2nd order runge-kutta steps, mode 1,2 */
SoftBody *sb= ob->soft; /* is supposed to be there */
BodyPoint *bp;
- float dx[3],dv[3],aabbmin[3],aabbmax[3],cm[3]={0.0f,0.0f,0.0f};
+ float dx[3]={0},dv[3],aabbmin[3],aabbmax[3],cm[3]={0.0f,0.0f,0.0f};
float timeovermass/*,freezeloc=0.00001f,freezeforce=0.00000000001f*/;
float maxerrpos= 0.0f,maxerrvel = 0.0f;
int a,fuzzy=0;
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2010-02-08
12:37:09 UTC (rev 26704)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2010-02-08
13:55:31 UTC (rev 26705)
@@ -282,7 +282,7 @@
static float sound_get_volume(Scene* scene, Sequence* sequence, float time)
{
- struct FCurve* fcu = id_data_find_fcurve(scene, sequence,
&RNA_Sequence, "volume", 0);
+ struct FCurve* fcu = id_data_find_fcurve(&scene->id, sequence,
&RNA_Sequence, "volume", 0);
if(fcu)
return evaluate_fcurve(fcu, time * FPS);
else
@@ -386,5 +386,5 @@
int sound_read_sound_buffer(bSound* sound, float* buffer, int length)
{
- AUD_readSound(sound->cache, buffer, length);
+ return AUD_readSound(sound->cache, buffer, length);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
