sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Remove outdated comment and add new one about slot IDs.

Browse Source
This commit is contained in:
Thomas Dinges 2016-05-11 22:25:48 +02:00
parent 4a4f043bc4
commit 16ce1b78b0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/kernel/geom/geom_volume.h
View File

@ -77,7 +77,6 @@ ccl_device float volume_attribute_float(KernelGlobals *kg, const ShaderData *sd,
if(dx) *dx = 0.0f;
if(dy) *dy = 0.0f;
/* todo: support float textures to lower memory usage for single floats */
return average(float4_to_float3(r));
}

4
intern/cycles/render/image.cpp
View File

@ -196,6 +196,10 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
return IMAGE_DATA_TYPE_BYTE4;
}
/* We use a consecutive slot counting scheme on the devices, in order
* float4, byte4, float.
* These functions convert the slot ids from ImageManager "images" ones
* to device ones and vice versa. */
int ImageManager::type_index_to_flattened_slot(int slot, ImageDataType type)
{
if(type == IMAGE_DATA_TYPE_BYTE4)