← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/python/api2_2x/sceneRender.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/python/api2_2x/sceneRender.c
1
1
/* 
2
 
 * $Id: sceneRender.c 17117 2008-10-19 21:39:50Z jesterking $
 
2
 * $Id: sceneRender.c 20870 2009-06-14 06:52:46Z campbellbarton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
663
663
#endif
664
664
                        system( str );
665
665
                } else
666
 
                        sprintf( "Can't find image: %s", file );
 
666
                        printf("Can't find image: %s\n", file);
667
667
        }
668
668
 
669
669
        Py_RETURN_NONE;
925
925
                        self->renderContext->border.ymax );
926
926
}
927
927
 
928
 
static PyObject *RenderData_EnableGammaCorrection( BPy_RenderData * self,
929
 
                                            PyObject * args )
930
 
{
931
 
        return M_Render_BitToggleInt( args, R_GAMMA,
932
 
                                      &self->renderContext->mode );
933
 
}
934
 
 
935
928
static PyObject *RenderData_GaussFilterSize( BPy_RenderData * self, PyObject * args )
936
929
{
937
930
        return M_Render_GetSetAttributeFloat( args,
1889
1882
                param = self->renderContext->bake_biasdist;
1890
1883
                break;
1891
1884
        case EXPP_RENDER_ATTR_ASPECTX:
1892
 
                param = (long)self->renderContext->xasp;
 
1885
                param = self->renderContext->xasp;
1893
1886
                break;
1894
1887
        case EXPP_RENDER_ATTR_ASPECTY:
1895
 
                param = (long)self->renderContext->yasp;
 
1888
                param = self->renderContext->yasp;
1896
1889
                break;
1897
1890
        default:
1898
1891
                return EXPP_ReturnPyObjError( PyExc_RuntimeError,