[Bf-blender-cvs] [fcea94489cb] master: Cycles: Cleanup, indentation
Sergey Sharybin
noreply at git.blender.org
Fri Jul 27 10:47:16 CEST 2018
Commit: fcea94489cb181504435868472a74d4887bba947
Author: Sergey Sharybin
Date: Fri Jul 27 10:28:28 2018 +0200
Branches: master
https://developer.blender.org/rBfcea94489cb181504435868472a74d4887bba947
Cycles: Cleanup, indentation
===================================================================
M intern/cycles/render/image.cpp
===================================================================
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 7f090b7a752..741dfb0717a 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -128,12 +128,12 @@ bool ImageManager::set_animation_frame_update(int frame)
device_memory *ImageManager::image_memory(int flat_slot)
{
- ImageDataType type;
- int slot = flattened_slot_to_type_index(flat_slot, &type);
+ ImageDataType type;
+ int slot = flattened_slot_to_type_index(flat_slot, &type);
- Image *img = images[type][slot];
+ Image *img = images[type][slot];
- return img->mem;
+ return img->mem;
}
bool ImageManager::get_image_metadata(int flat_slot,
More information about the Bf-blender-cvs
mailing list