[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20422] trunk/blender/source: Misc warnings
Campbell Barton
ideasman42 at gmail.com
Tue May 26 12:44:15 CEST 2009
Revision: 20422
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20422
Author: campbellbarton
Date: 2009-05-26 12:44:14 +0200 (Tue, 26 May 2009)
Log Message:
-----------
Misc warnings
- Removed/Commented some unused vars
- CValue::GetPropertyText() could return a temp reference to a variable on the stack, option wasnt used anywhere so removed.
- KX_ConstraintWrapper::GetConstraintId allows args but ignored them
- KX_ConstraintWrapper::PySetParam didnt return NULL on an error (messing up pythons exceptions).
- BLI_natstrcmp didnt return 0 when the while loop exited
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenlib/intern/util.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/src/butspace.c
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/drawobject.c
trunk/blender/source/gameengine/Expressions/Value.cpp
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/VideoTexture/PyTypeList.cpp
Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -57,6 +57,7 @@
struct bConstraintTarget;
struct ListBase;
struct EditFace;
+struct LOD_Decimation_Info;
char *getIpoCurveName( struct IpoCurve * icu );
void insert_vert_icu(struct IpoCurve *icu, float x, float y, short fast);
@@ -160,7 +161,7 @@
void free_oops(struct Oops *oops){}
void exit_posemode(int freedata){}
void error(char *str, ...){}
-int okee(char *str, ...){}
+int okee(char *str, ...){return 1;}
/* anim.c */
ListBase editNurb;
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -747,7 +747,7 @@
float ctime, pa_time, scale = 1.0f;
float tmat[4][4], mat[4][4], pamat[4][4], size=0.0;
float (*obmat)[4], (*oldobmat)[4];
- int lay, a, b, k, counter, hair = 0;
+ int lay, a, b, counter, hair = 0;
int totpart, totchild, totgroup=0, pa_num;
if(psys==0) return;
Modified: trunk/blender/source/blender/blenlib/intern/util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/util.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/blenlib/intern/util.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -2030,7 +2030,7 @@
d1++;
d2++;
}
-
+ return 0;
}
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2009-05-26 10:44:14 UTC (rev 20422)
@@ -865,7 +865,7 @@
for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
{
- const Channel &channel = i.channel();
+ /* const Channel &channel = i.channel(); */ /* Not used yet */
const char *str= i.name();
int len= strlen(str);
if(len) {
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Geometry.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -488,7 +488,7 @@
float k2[4] = {0.0, 0.0, 0.0, 0.0};
float h2[4] = {0.0, 0.0, 0.0, 0.0};
- float a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y, xi, yi, a1,a2,b1,b2, newvec[2];
+
if( !PyArg_ParseTuple ( args, "O!O!O!O!i",
&vector_Type, &vec_k1,
&vector_Type, &vec_h1,
Modified: trunk/blender/source/blender/src/butspace.c
===================================================================
--- trunk/blender/source/blender/src/butspace.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/src/butspace.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -511,7 +511,7 @@
static void do_node_buts(unsigned short event)
{
Material *ma;
- SpaceNode *snode = curarea->spacedata.first;
+ /* SpaceNode *snode = curarea->spacedata.first; */
/* all operations default on active material layer here */
/* but this also gets called for lamp and world... */
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/src/buttons_editing.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -6437,7 +6437,7 @@
}
else {
if (
- (sima==NULL) && /* 3D View */
+ (!sima) && /* 3D View */
(settings->imapaint.flag & IMAGEPAINT_PROJECT_DISABLE)==0 && /* Projection Painting */
(settings->imapaint.tool == PAINT_TOOL_CLONE)
) {
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/blender/src/drawobject.c 2009-05-26 10:44:14 UTC (rev 20422)
@@ -2918,7 +2918,7 @@
float cfra=bsystem_time(ob,(float)CFRA,0.0);
float *vdata=0, *vedata=0, *cdata=0, *ndata=0, *vd=0, *ved=0, *cd=0, *nd=0, xvec[3], yvec[3], zvec[3];
float ma_r=0.0f, ma_g=0.0f, ma_b=0.0f;
- int a, k, k_max=0, totpart, totpoint=0, draw_as, totchild=0;
+ int a, totpart, totpoint=0, draw_as, totchild=0;
int select=ob->flag&SELECT, create_cdata=0;
GLint polygonmode[2];
char val[32];
Modified: trunk/blender/source/gameengine/Expressions/Value.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.cpp 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/Expressions/Value.cpp 2009-05-26 10:44:14 UTC (rev 20422)
@@ -292,15 +292,13 @@
//
// Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
//
-const STR_String& CValue::GetPropertyText(const STR_String & inName,const char *deftext)
+const STR_String& CValue::GetPropertyText(const STR_String & inName)
{
const static STR_String sEmpty("");
CValue *property = GetProperty(inName);
if (property)
return property->GetText();
- else if (deftext)
- return STR_String(deftext);
else
return sEmpty;
}
Modified: trunk/blender/source/gameengine/Expressions/Value.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Value.h 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/Expressions/Value.h 2009-05-26 10:44:14 UTC (rev 20422)
@@ -310,7 +310,7 @@
virtual void SetProperty(const char* name,CValue* ioProperty);
virtual CValue* GetProperty(const char* inName); // Get pointer to a property with name <inName>, returns NULL if there is no property named <inName>
virtual CValue* GetProperty(const STR_String & inName);
- const STR_String& GetPropertyText(const STR_String & inName,const char *deftext=NULL); // Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
+ const STR_String& GetPropertyText(const STR_String & inName); // Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
float GetPropertyNumber(const STR_String& inName,float defnumber);
virtual bool RemoveProperty(const char *inName); // Remove the property named <inName>, returns true if the property was succesfully removed, false if property was not found or could not be removed
virtual vector<STR_String> GetPropertyNames();
Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp 2009-05-26 10:44:14 UTC (rev 20422)
@@ -288,10 +288,7 @@
int height)
{
STR_String tmpstr(text);
- int lines;
char* s = tmpstr.Ptr();
- char* p;
-
// Save and change OpenGL settings
int texture2D;
Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp 2009-05-26 10:44:14 UTC (rev 20422)
@@ -1105,7 +1105,6 @@
"getScreenRay()\n"
)
{
- KX_Camera* cam;
MT_Vector3 vect;
double x,y,dist;
char *propName = NULL;
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp 2009-05-26 10:44:14 UTC (rev 20422)
@@ -49,23 +49,20 @@
{
}
-PyObject* KX_ConstraintWrapper::PyGetConstraintId(PyObject* args, PyObject* kwds)
+PyObject* KX_ConstraintWrapper::PyGetConstraintId()
{
return PyInt_FromLong(m_constraintId);
}
PyObject* KX_ConstraintWrapper::PySetParam(PyObject* args, PyObject* kwds)
{
- int len = PyTuple_Size(args);
- int success = 1;
-
int dof;
float minLimit,maxLimit;
- success = PyArg_ParseTuple(args,"iff:setParam",&dof,&minLimit,&maxLimit);
- if (success)
- {
- m_physenv->setConstraintParam(m_constraintId,dof,minLimit,maxLimit);
- }
+
+ if (!PyArg_ParseTuple(args,"iff:setParam",&dof,&minLimit,&maxLimit))
+ return NULL;
+
+ m_physenv->setConstraintParam(m_constraintId,dof,minLimit,maxLimit);
Py_RETURN_NONE;
}
@@ -120,7 +117,7 @@
PyMethodDef KX_ConstraintWrapper::Methods[] = {
- {"getConstraintId",(PyCFunction) KX_ConstraintWrapper::sPyGetConstraintId, METH_VARARGS},
+ {"getConstraintId",(PyCFunction) KX_ConstraintWrapper::sPyGetConstraintId, METH_NOARGS},
{"setParam",(PyCFunction) KX_ConstraintWrapper::sPySetParam, METH_VARARGS},
{NULL,NULL} //Sentinel
};
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h 2009-05-26 08:30:28 UTC (rev 20421)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h 2009-05-26 10:44:14 UTC (rev 20422)
@@ -43,8 +43,7 @@
virtual ~KX_ConstraintWrapper ();
int getConstraintId() { return m_constraintId;};
- KX_PYMETHOD(KX_ConstraintWrapper,TestMethod);
- KX_PYMETHOD(KX_ConstraintWrapper,GetConstraintId);
+ KX_PYMETHOD_NOARGS(KX_ConstraintWrapper,GetConstraintId);
KX_PYMETHOD(KX_ConstraintWrapper,SetParam);
private:
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list