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:
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index 5932c24cb74..627ad3ce6aa 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -152,7 +152,7 @@ private:
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);
- string name_from_type(int type);
+ const char* name_from_type(ImageDataType type);
void device_load_image(Device *device,
Scene *scene,