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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-07-27 11:22:45 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-07-27 11:22:45 +0300
commitde80b928a33bb753bec360e0d4cfeafd0bf23b0c (patch)
tree725c4e5a24b3d003247f1385291acddfacf20272
parente977fe985f019b7b28c022ffb0ca8fb37f6418ee (diff)
Cycles: Cleanup, remove unused function
-rw-r--r--intern/cycles/render/image.cpp9
-rw-r--r--intern/cycles/render/image.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 854eddac716..b8892a5329d 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -229,15 +229,6 @@ bool ImageManager::get_image_metadata(const string& filename,
return true;
}
-int ImageManager::max_flattened_slot(ImageDataType type)
-{
- if(tex_num_images[type] == 0) {
- /* No textures for the type, no slots needs allocation. */
- return 0;
- }
- return type_index_to_flattened_slot(tex_num_images[type], type);
-}
-
/* The lower three bits of a device texture slot number indicate its type.
* These functions convert the slot ids from ImageManager "images" ones
* to device ones and vice verse.
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 627ad3ce6aa..40b8629d549 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -149,7 +149,6 @@ private:
int texture_limit,
device_vector<DeviceType>& tex_img);
- int max_flattened_slot(ImageDataType type);
int type_index_to_flattened_slot(int slot, ImageDataType type);
int flattened_slot_to_type_index(int flat_slot, ImageDataType *type);
const char* name_from_type(ImageDataType type);