_updates and warning fix_

* fixed a few warnings in the python project
* added timeline to py project

diff --git a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
index a2566add97348343231b0afd125f70066cd6e034..b57342f2e6ffd3a32b5efec40a8b7c7c56639740 100644 (file)
--- a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
@@ -193,6 +193,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\sceneRender.c">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\python\api2_2x\sceneTimeLine.c">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sound.c">
                        </File>
@@ -351,6 +354,9 @@
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\sceneRender.h">
                        </File>
+                       <File
+                               RelativePath="..\..\..\source\blender\python\api2_2x\sceneTimeLine.h">
+                       </File>
                        <File
                                RelativePath="..\..\..\source\blender\python\api2_2x\Sound.h">
                        </File>
@@ -411,9 +417,6 @@
                                <File
                                        RelativePath="..\..\..\source\blender\python\api2_2x\Ipocurve.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\..\source\blender\python\api2_2x\line.h">
-                               </File>
                                <File
                                        RelativePath="..\..\..\source\blender\python\api2_2x\logic.h">
                                </File>

diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 6fd9737cace9bb0fc76517f09c63a9a5e0217350..81be14de13e26179c20edba69bfdbdadd344fc8a 100644 (file)
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -83,22 +83,22 @@
 #define EXPP_MAT_MODE_NOMIST                   MA_NOMIST
 #define EXPP_MAT_MODE_ENV                      MA_ENV
 /* Material MIN, MAX values */
-#define EXPP_MAT_ADD_MIN                        0.0
-#define EXPP_MAT_ADD_MAX                        1.0
-#define EXPP_MAT_ALPHA_MIN        0.0
-#define EXPP_MAT_ALPHA_MAX              1.0
-#define EXPP_MAT_AMB_MIN                        0.0
-#define EXPP_MAT_AMB_MAX                        1.0
-#define EXPP_MAT_COL_MIN                        0.0 /* min/max for all ... */
-#define EXPP_MAT_COL_MAX                        1.0 /* ... color triplets  */
-#define EXPP_MAT_EMIT_MIN                       0.0
-#define EXPP_MAT_EMIT_MAX                       1.0
-#define EXPP_MAT_REF_MIN                        0.0
-#define EXPP_MAT_REF_MAX                        1.0
-#define EXPP_MAT_SPEC_MIN                       0.0
-#define EXPP_MAT_SPEC_MAX                       2.0
-#define EXPP_MAT_SPECTRA_MIN    0.0
-#define EXPP_MAT_SPECTRA_MAX    1.0
+#define EXPP_MAT_ADD_MIN                        0.0f
+#define EXPP_MAT_ADD_MAX                        1.0f
+#define EXPP_MAT_ALPHA_MIN        0.0f
+#define EXPP_MAT_ALPHA_MAX              1.0f
+#define EXPP_MAT_AMB_MIN                        0.0f
+#define EXPP_MAT_AMB_MAX                        1.0f
+#define EXPP_MAT_COL_MIN                        0.0f /* min/max for all ... */
+#define EXPP_MAT_COL_MAX                        1.0f /* ... color triplets  */
+#define EXPP_MAT_EMIT_MIN                       0.0f
+#define EXPP_MAT_EMIT_MAX                       1.0f
+#define EXPP_MAT_REF_MIN                        0.0f
+#define EXPP_MAT_REF_MAX                        1.0f
+#define EXPP_MAT_SPEC_MIN                       0.0f
+#define EXPP_MAT_SPEC_MAX                       2.0f
+#define EXPP_MAT_SPECTRA_MIN    0.0f
+#define EXPP_MAT_SPECTRA_MAX    1.0f
 
 /* Shader spesific settings */
 #define EXPP_MAT_SPEC_SHADER_MIN                        0
@@ -106,22 +106,22 @@
 #define EXPP_MAT_DIFFUSE_SHADER_MIN                     0
 #define EXPP_MAT_DIFFUSE_SHADER_MAX                     4
 
-#define EXPP_MAT_ROUGHNESS_MIN                  0.0
-#define EXPP_MAT_ROUGHNESS_MAX                  3.140
-#define EXPP_MAT_SPECSIZE_MIN                   0.0
-#define EXPP_MAT_SPECSIZE_MAX                   1.530
-#define EXPP_MAT_DIFFUSESIZE_MIN                0.0
-#define EXPP_MAT_DIFFUSESIZE_MAX                        3.140
-#define EXPP_MAT_SPECSMOOTH_MIN                         0.0
-#define EXPP_MAT_SPECSMOOTH_MAX                         1.0
-#define EXPP_MAT_DIFFUSESMOOTH_MIN                      0.0
-#define EXPP_MAT_DIFFUSESMOOTH_MAX                      1.0
-#define EXPP_MAT_DIFFUSE_DARKNESS_MIN                   0.0
-#define EXPP_MAT_DIFFUSE_DARKNESS_MAX                   2.0
-#define EXPP_MAT_REFRACINDEX_MIN                        1.0
-#define EXPP_MAT_REFRACINDEX_MAX                        10.0
-#define EXPP_MAT_RMS_MIN                        0.0
-#define EXPP_MAT_RMS_MAX                        0.4
+#define EXPP_MAT_ROUGHNESS_MIN                  0.0f
+#define EXPP_MAT_ROUGHNESS_MAX                  3.140f
+#define EXPP_MAT_SPECSIZE_MIN                   0.0f
+#define EXPP_MAT_SPECSIZE_MAX                   1.530f
+#define EXPP_MAT_DIFFUSESIZE_MIN                0.0f
+#define EXPP_MAT_DIFFUSESIZE_MAX                        3.140f
+#define EXPP_MAT_SPECSMOOTH_MIN                         0.0f
+#define EXPP_MAT_SPECSMOOTH_MAX                         1.0f
+#define EXPP_MAT_DIFFUSESMOOTH_MIN                      0.0f
+#define EXPP_MAT_DIFFUSESMOOTH_MAX                      1.0f
+#define EXPP_MAT_DIFFUSE_DARKNESS_MIN                   0.0f
+#define EXPP_MAT_DIFFUSE_DARKNESS_MAX                   2.0f
+#define EXPP_MAT_REFRACINDEX_MIN                        1.0f
+#define EXPP_MAT_REFRACINDEX_MAX                        10.0f
+#define EXPP_MAT_RMS_MIN                        0.0f
+#define EXPP_MAT_RMS_MAX                        0.4f
 /* End shader settings */
 
 /* diff_shader */
@@ -1825,7 +1825,7 @@ static PyObject *Material_setSpecShader( BPy_Material * self, PyObject * args )
                return ( EXPP_ReturnPyObjError( PyExc_TypeError,
                                                "expected int argument" ) );
 
-       self->material->spec_shader = EXPP_ClampInt( value, EXPP_MAT_SPEC_SHADER_MIN,
+       self->material->spec_shader = (short)EXPP_ClampInt( value, EXPP_MAT_SPEC_SHADER_MIN,
                                               EXPP_MAT_SPEC_SHADER_MAX );
        
        Py_INCREF( Py_None );
@@ -1840,7 +1840,7 @@ static PyObject *Material_setDiffuseShader( BPy_Material * self, PyObject * args
                return ( EXPP_ReturnPyObjError( PyExc_TypeError,
                                                "expected int argument" ) );
 
-       self->material->diff_shader = EXPP_ClampInt( value, EXPP_MAT_DIFFUSE_SHADER_MIN,
+       self->material->diff_shader = (short)EXPP_ClampInt( value, EXPP_MAT_DIFFUSE_SHADER_MIN,
                                               EXPP_MAT_DIFFUSE_SHADER_MAX );
        
        Py_INCREF( Py_None );
@@ -2627,10 +2627,10 @@ static PyObject *Material_getAttr( BPy_Material * self, char *name )
                                           id.us );
        /* Shader settings*/
        else if( strcmp( name, "specShader" ) == 0 )
-               attr = PyInt_FromLong( ( double ) self->material->
+               attr = PyInt_FromLong( ( long ) self->material->
                                           spec_shader );
        else if( strcmp( name, "diffuseShader" ) == 0 )
-               attr = PyInt_FromLong( ( double ) self->material->
+               attr = PyInt_FromLong( ( long ) self->material->
                                           diff_shader );
        else if( strcmp( name, "roughness" ) == 0 )
                attr = PyFloat_FromDouble( ( double ) self->material->

diff --git a/source/blender/python/api2_2x/sceneTimeLine.c b/source/blender/python/api2_2x/sceneTimeLine.c
index ab0a54a17a9d512a7628296050665b71f1dd9d3d..d4b1710251a03599ca23033fbd61a9ed42e442db 100644 (file)
--- a/source/blender/python/api2_2x/sceneTimeLine.c
+++ b/source/blender/python/api2_2x/sceneTimeLine.c
@@ -176,7 +176,8 @@ static PyObject *TimeLine_getFramesMarked (BPy_TimeLine *self, PyObject *args) {
        if (tmarker) {
                int f;
                char *s= NULL;
-               if (PyInt_Check (tmarker) && (f= PyInt_AsLong (tmarker)) ) {
+               f = PyInt_AsLong (tmarker);
+               if (PyInt_Check (tmarker) && f != 0) {
                        for (marker_it= self->marker_list->first; marker_it; marker_it= marker_it->next)
                                if (marker_it->frame==f) PyList_Append (marker_list, PyString_FromString (marker_it->name));
                }