diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
| commit | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (patch) | |
| tree | 5b00bbd7dd2f8d08affce8ad7d5688f5b786cde4 /source/blender/blenkernel/intern/texture.c | |
| parent | edf32a6fb0213bf35748890dfbc84b20d384298e (diff) | |
Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 0171c58f2c6..818e6195049 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -518,7 +518,7 @@ void default_tex(Tex *tex) /* ------------------------------------------------------------------------- */ -Tex *add_texture(char *name) +Tex *add_texture(const char *name) { Tex *tex; |