[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12135] branches/2-44-stable/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Mon Sep 24 18:32:48 CEST 2007
Revision: 12135
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12135
Author: bdiego
Date: 2007-09-24 18:32:48 +0200 (Mon, 24 Sep 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 12026
revision 12027
revision 12031
revision 12033
revision 12051
revision 12055
revision 12056
revision 12077
revision 12127
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12026
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12027
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12031
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12033
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12051
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12055
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12056
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12077
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12127
Modified Paths:
--------------
branches/2-44-stable/blender/intern/elbeem/intern/attributes.cpp
branches/2-44-stable/blender/intern/elbeem/intern/particletracer.cpp
branches/2-44-stable/blender/release/Makefile
branches/2-44-stable/blender/source/blender/blenkernel/intern/effect.c
branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/2-44-stable/blender/source/blender/python/BPY_interface.c
branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c
branches/2-44-stable/blender/source/blender/python/api2_2x/Pose.c
branches/2-44-stable/blender/source/blender/python/api2_2x/bpy_data.c
branches/2-44-stable/blender/source/blender/render/intern/source/texture.c
branches/2-44-stable/blender/source/blender/src/buttons_scene.c
branches/2-44-stable/blender/source/blender/src/editnla.c
branches/2-44-stable/blender/source/blender/src/editobject.c
branches/2-44-stable/blender/source/blender/src/editscreen.c
branches/2-44-stable/blender/source/blender/src/fluidsim.c
branches/2-44-stable/blender/source/blender/src/parametrizer.c
branches/2-44-stable/blender/source/blender/src/transform.c
branches/2-44-stable/blender/source/blender/src/transform_generics.c
branches/2-44-stable/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
Modified: branches/2-44-stable/blender/intern/elbeem/intern/attributes.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/attributes.cpp 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/intern/elbeem/intern/attributes.cpp 2007-09-24 16:32:48 UTC (rev 12135)
@@ -103,6 +103,7 @@
// set that a parameter can be given, and will be ignored...
bool AttributeList::ignoreParameter(string name, string source) {
+ name=source=(""); // remove warning
return false;
}
Modified: branches/2-44-stable/blender/intern/elbeem/intern/particletracer.cpp
===================================================================
--- branches/2-44-stable/blender/intern/elbeem/intern/particletracer.cpp 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/intern/elbeem/intern/particletracer.cpp 2007-09-24 16:32:48 UTC (rev 12135)
@@ -325,6 +325,7 @@
// suppress warnings...
vertices = NULL; triangles = NULL;
normals = NULL; objectId = 0;
+ time = 0.0;
#else // ELBEEM_PLUGIN
int pcnt = 0;
// currently not used in blender
Modified: branches/2-44-stable/blender/release/Makefile
===================================================================
--- branches/2-44-stable/blender/release/Makefile 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/release/Makefile 2007-09-24 16:32:48 UTC (rev 12135)
@@ -33,7 +33,7 @@
export VERSION := $(shell cat VERSION)
-BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
+BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)-py$(NAN_PYTHON_VERSION)$(TYPE)
export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
export CONFDIR=$(DISTDIR)/.blender
Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/effect.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/effect.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -1686,7 +1686,9 @@
float *volengths= NULL, *folengths= NULL;
int deform=0, a, totpart, paf_sta, paf_end;
int waitcursor_set= 0, totvert, totface, curface, curvert;
+#ifndef DISABLE_ELBEEM
int readMask, activeParts, fileParts;
+#endif
/* return conditions */
if(ob->type!=OB_MESH) return;
Modified: branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
===================================================================
--- branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -89,9 +89,20 @@
/* outputs: value, color, normal */
if(node->id) {
+ RenderResult *rr= RE_GetResult(RE_GetRender(G.scene->id.name)); /* G.scene is WEAK! */
+ short sizex, sizey;
+
/* first make the preview image */
CompBuf *prevbuf= alloc_compbuf(140, 140, CB_RGBA, 1); /* alloc */
+ if (rr) {
+ sizex = rr->rectx;
+ sizey = rr->recty;
+ } else {
+ sizex = G.scene->r.xsch;
+ sizey = G.scene->r.ysch;
+ }
+
prevbuf->rect_procedural= texture_procedural;
prevbuf->node= node;
composit1_pixel_processor(node, prevbuf, prevbuf, out[0]->vec, do_copy_rgba, CB_RGBA);
@@ -99,15 +110,15 @@
free_compbuf(prevbuf);
if(out[0]->hasoutput) {
- CompBuf *stackbuf= alloc_compbuf(140, 140, CB_VAL, 1); /* alloc */
+ CompBuf *stackbuf= alloc_compbuf(sizex, sizey, CB_VAL, 1); /* alloc */
stackbuf->rect_procedural= texture_procedural;
stackbuf->node= node;
- out[0]->data= stackbuf;
+ out[0]->data= stackbuf;
}
if(out[1]->hasoutput) {
- CompBuf *stackbuf= alloc_compbuf(140, 140, CB_RGBA, 1); /* alloc */
+ CompBuf *stackbuf= alloc_compbuf(sizex, sizey, CB_RGBA, 1); /* alloc */
stackbuf->rect_procedural= texture_procedural;
stackbuf->node= node;
Modified: branches/2-44-stable/blender/source/blender/python/BPY_interface.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/BPY_interface.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/python/BPY_interface.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -265,25 +265,32 @@
void syspath_append( char *dirname )
{
- PyObject *mod_sys, *dict, *path, *dir;
-
+ PyObject *mod_sys= NULL, *dict= NULL, *path= NULL, *dir= NULL;
+ short ok=1;
PyErr_Clear( );
dir = Py_BuildValue( "s", dirname );
mod_sys = PyImport_ImportModule( "sys" ); /* new ref */
- dict = PyModule_GetDict( mod_sys ); /* borrowed ref */
- path = PyDict_GetItemString( dict, "path" ); /* borrowed ref */
+
+ if (mod_sys) {
+ dict = PyModule_GetDict( mod_sys ); /* borrowed ref */
+ path = PyDict_GetItemString( dict, "path" ); /* borrowed ref */
+ if ( !PyList_Check( path ) ) {
+ ok = 0;
+ }
+ } else {
+ /* cant get the sys module */
+ ok = 0;
+ }
- if( !PyList_Check( path ) )
- return;
+ if (ok && PyList_Append( path, dir ) != 0)
+ ok = 0; /* append failed */
- PyList_Append( path, dir );
+ if( (ok==0) || PyErr_Occurred( ) )
+ Py_FatalError( "could import or build sys.path, can't continue" );
- if( PyErr_Occurred( ) )
- Py_FatalError( "could not build sys.path" );
-
- Py_DECREF( mod_sys );
+ Py_XDECREF( mod_sys );
}
void init_syspath( int first_time )
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -199,7 +199,7 @@
static PyObject *Noise_randuvec( PyObject * self )
{
- float v[3];
+ float v[3] = {0.0f, 0.0f, 0.0f};
randuvec( v );
return Py_BuildValue( "[fff]", v[0], v[1], v[2] );
}
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Pose.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Pose.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Pose.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -693,9 +693,12 @@
}
//get loc
- if (matsize == 4){
+ if (matsize == 4) {
VECCOPY(loc, matrix->matrix[3]);
}
+ else {
+ loc[0]= loc[1]= loc[2]= 0.0f;
+ }
//copy new attributes
VECCOPY(self->posechannel->size, size);
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/bpy_data.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/bpy_data.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/bpy_data.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -407,7 +407,7 @@
static char *kwlist[] = {"name", "filename", NULL};
if(PyArg_ParseTupleAndKeywords(args, kwd, "|ss", kwlist, &name, &filename) && filename ) {
- PyObject *ret;
+ PyObject *ret= NULL;
if (strlen(filename) > FILE_MAXDIR + FILE_MAXFILE - 1)
return ( EXPP_ReturnPyObjError( PyExc_IOError,
Modified: branches/2-44-stable/blender/source/blender/render/intern/source/texture.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/texture.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/texture.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -1390,7 +1390,7 @@
TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
float *co = NULL, *dx = NULL, *dy = NULL;
float fact, facm, factt, facmm, stencilTin=1.0;
- float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3], warpvec[3], Tnor=1.0;
+ float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3], warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0;
int tex_nr, rgbnor= 0, warpdone=0;
if (R.r.scemode & R_NO_TEX) return;
Modified: branches/2-44-stable/blender/source/blender/src/buttons_scene.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/buttons_scene.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/src/buttons_scene.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -1622,7 +1622,7 @@
uiBlockEndAlign(block);
}
-
+#ifndef DISABLE_YAFRAY /* disable yafray stuff */
/* yafray: global illumination options panel */
static void render_panel_yafrayGI()
{
@@ -1725,8 +1725,8 @@
uiDefButF(block, NUMSLI, B_DIFF, "Thr ", 160,90,150,20, &G.scene->r.YF_AAthreshold, 0.000001, 1.0, 0, 0, "AA threshold");
}
}
+#endif /* disable yafray stuff */
-
static void layer_copy_func(void *lay_v, void *lay_p)
{
unsigned int *lay= lay_p;
Modified: branches/2-44-stable/blender/source/blender/src/editnla.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editnla.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/src/editnla.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -935,7 +935,7 @@
bActionChannel *chan;
bActionStrip *strip;
bConstraintChannel *conchan;
- float sval[2], cval[2], lastcval[2];
+ float sval[2], cval[2], lastcval[2]= {0.0f, 0.0f};
float fac=0.0F;
float deltax, startx;
int i;
@@ -1032,7 +1032,7 @@
for (chan=base->object->action->chanbase.first; chan; chan=chan->next){
if (EDITABLE_ACHAN(chan)) {
tvtot=add_trans_ipo_keys(chan->ipo, tv, tvtot);
-
+
/* Manipulate action constraint ipos */
if (EXPANDED_ACHAN(chan) && FILTER_CON_ACHAN(chan)) {
for (conchan=chan->constraintChannels.first; conchan; conchan=conchan->next) {
Modified: branches/2-44-stable/blender/source/blender/src/editobject.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editobject.c 2007-09-24 13:17:42 UTC (rev 12134)
+++ branches/2-44-stable/blender/source/blender/src/editobject.c 2007-09-24 16:32:48 UTC (rev 12135)
@@ -74,6 +74,7 @@
#include "DNA_meta_types.h"
#include "DNA_nla_types.h"
#include "DNA_object_types.h"
+#include "DNA_object_fluidsim.h"
#include "DNA_object_force.h"
#include "DNA_scene_types.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list