diff options
author | Ton Roosendaal <ton@blender.org> | 2011-02-05 16:10:20 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-02-05 16:10:20 +0300 |
commit | fe99f35210bfe932e8f1e8161dc9fe68cd09bf5d (patch) | |
tree | 39e5a13817c60a9742fa7b8cb9864e4fac316cfc /source/blender | |
parent | df9fade564d3b1a5ed57d397918652cd72c79783 (diff) |
Renamed texture.c in render module, to prevent debuggers to
complain about the same named file in blenkernel.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c (renamed from source/blender/render/intern/source/texture.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 47246f149ae..58aad270583 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -63,6 +63,7 @@ set(SRC intern/source/rayobject_raycounter.c intern/source/rayshade.c intern/source/rendercore.c + intern/source/render_texture.c intern/source/renderdatabase.c intern/source/shadbuf.c intern/source/shadeinput.c @@ -70,7 +71,6 @@ set(SRC intern/source/sss.c intern/source/strand.c intern/source/sunsky.c - intern/source/texture.c intern/source/volume_precache.c intern/source/volumetric.c intern/source/voxeldata.c diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/render_texture.c index a62c4bd8e74..a62c4bd8e74 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/render_texture.c |