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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-14 11:38:17 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-14 12:44:36 +0300
commit17b029d80efaf51df55cd1133718d1cf69aa244f (patch)
tree639c399913eca1935e20dacc1352e7d71b12db34 /source/blender/blenkernel/BKE_studiolight.h
parentfecec7dd6889785e4f11aa95f40ad30b225a01c8 (diff)
T55406: Flip Matcap
- Icon represent the flipped matcap in the shading menu - Added template_icon to display any icon in scale.
Diffstat (limited to 'source/blender/blenkernel/BKE_studiolight.h')
-rw-r--r--source/blender/blenkernel/BKE_studiolight.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h
index 50cc3d9734f..e4c4fd87ecd 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -51,8 +51,11 @@
#define STUDIOLIGHT_Y_NEG 3
#define STUDIOLIGHT_Z_POS 4
#define STUDIOLIGHT_Z_NEG 5
-#define STUDIOLIGHT_ICON_ID_TYPE_RADIANCE 0
-#define STUDIOLIGHT_ICON_ID_TYPE_IRRADIANCE 1
+
+#define STUDIOLIGHT_ICON_ID_TYPE_RADIANCE 0
+#define STUDIOLIGHT_ICON_ID_TYPE_IRRADIANCE 1
+#define STUDIOLIGHT_ICON_ID_TYPE_MATCAP 2
+#define STUDIOLIGHT_ICON_ID_TYPE_MATCAP_FLIPPED 3
struct GPUTexture;
@@ -83,8 +86,10 @@ typedef struct StudioLight {
char name[FILE_MAXFILE];
char path[FILE_MAX];
char *path_irr;
- int irradiance_icon_id;
- int radiance_icon_id;
+ int icon_id_irradiance;
+ int icon_id_radiance;
+ int icon_id_matcap;
+ int icon_id_matcap_flipped;
int index;
float diffuse_light[6][3];
float light_direction[3];