Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-25 06:41:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-25 06:41:30 +0400
commite1a54214bbed9b32e1aee0e849ae654c495afa80 (patch)
treea95eaa2b98e7baa7e91fa34db46571e531b1cfb3 /source/gameengine/VideoTexture/Texture.cpp
parent153eea5f23e2f0060d89a701ddd9b48085fc6070 (diff)
code cleanup:
- remove unused defines. - quiet some shadow warnings. - bevel, ifdef out some asserts that are too common. - style
Diffstat (limited to 'source/gameengine/VideoTexture/Texture.cpp')
-rw-r--r--source/gameengine/VideoTexture/Texture.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index 98d36d19ddf..ebad7a92437 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -68,8 +68,8 @@ BlendType<KX_LightObject> lightObjectType ("KX_LightObject");
// load texture
-void loadTexture (unsigned int texId, unsigned int * texture, short * size,
- bool mipmap)
+void loadTexture(unsigned int texId, unsigned int *texture, short *size,
+ bool mipmap)
{
// load texture for rendering
glBindTexture(GL_TEXTURE_2D, texId);
@@ -171,8 +171,8 @@ static PyObject *Texture_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
// forward declaration
-PyObject *Texture_close(Texture * self);
-int Texture_setSource (Texture * self, PyObject *value, void *closure);
+PyObject *Texture_close(Texture *self);
+int Texture_setSource(Texture *self, PyObject *value, void *closure);
// Texture object deallocation
@@ -191,7 +191,7 @@ static void Texture_dealloc(Texture *self)
ExceptionID MaterialNotAvail;
-ExpDesc MaterialNotAvailDesc (MaterialNotAvail, "Texture material is not available");
+ExpDesc MaterialNotAvailDesc(MaterialNotAvail, "Texture material is not available");
// Texture object initialization
static int Texture_init(Texture *self, PyObject *args, PyObject *kwds)
@@ -439,7 +439,7 @@ static PyObject *Texture_getSource(Texture *self, PyObject *value, void *closure
// set source object
-int Texture_setSource (Texture * self, PyObject *value, void *closure)
+int Texture_setSource(Texture *self, PyObject *value, void *closure)
{
// check new value
if (value == NULL || !pyImageTypes.in(Py_TYPE(value)))