[Bf-blender-cvs] [de80b928a33] master: Cycles: Cleanup, remove unused function
Sergey Sharybin
noreply at git.blender.org
Fri Jul 27 10:47:11 CEST 2018
Commit: de80b928a33bb753bec360e0d4cfeafd0bf23b0c
Author: Sergey Sharybin
Date: Fri Jul 27 10:22:45 2018 +0200
Branches: master
https://developer.blender.org/rBde80b928a33bb753bec360e0d4cfeafd0bf23b0c
Cycles: Cleanup, remove unused function
===================================================================
M intern/cycles/render/image.cpp
M intern/cycles/render/image.h
===================================================================
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);
More information about the Bf-blender-cvs
mailing list