Workbench: Matcaps T55291

- users can use their own matcaps
.config/blender/2.80/datafiles/studiolights/matcap/ folder
- upto 100 matcaps can be loaded
- color of the matcap is influenced by the color of the material/single
color etc. To show the plain matcap use single color at 1.0
- chosing a matcap is at lighting level (flat/studio/matcap)
- matcap only possible in solid mode
- also works for X-Ray mode

As the old matcaps are still in used by the clay engine I didn't remove
it yet.

1 files changed, 16 insertions, 9 deletions

diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h
index 2f2e948ab26..9bf9f0ea904 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -59,15 +59,21 @@ struct GPUTexture;
 enum StudioLightFlag {
 	STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED                    = (1 << 0),
 	STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED                  = (1 << 1),
-	STUDIOLIGHT_EXTERNAL_FILE                               = (1 << 2),
-	STUDIOLIGHT_ORIENTATION_CAMERA                          = (1 << 3),
-	STUDIOLIGHT_ORIENTATION_WORLD                           = (1 << 4),
-	STUDIOLIGHT_EQUIRECTANGULAR_IMAGE_LOADED                = (1 << 5),
-	STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_IMAGE_CALCULATED = (1 << 6),
-	STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE         = (1 << 7),
-	STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE       = (1 << 8),
-	STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED                 = (1 << 9),
+	STUDIOLIGHT_INTERNAL                                    = (1 << 2),
+	STUDIOLIGHT_EXTERNAL_FILE                               = (1 << 3),
+	STUDIOLIGHT_ORIENTATION_CAMERA                          = (1 << 4),
+	STUDIOLIGHT_ORIENTATION_WORLD                           = (1 << 5),
+	STUDIOLIGHT_ORIENTATION_VIEWNORMAL                      = (1 << 6),
+	STUDIOLIGHT_EXTERNAL_IMAGE_LOADED                       = (1 << 7),
+	STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_IMAGE_CALCULATED = (1 << 8),
+	STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE         = (1 << 9),
+	STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE       = (1 << 10),
+	STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED                 = (1 << 11),
 } StudioLightFlag;
+#define STUDIOLIGHT_FLAG_ALL (STUDIOLIGHT_INTERNAL | STUDIOLIGHT_EXTERNAL_FILE)
+#define STUDIOLIGHT_FLAG_ORIENTATIONS (STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD | STUDIOLIGHT_ORIENTATION_VIEWNORMAL)
+#define STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE (STUDIOLIGHT_INTERNAL | STUDIOLIGHT_ORIENTATION_WORLD)
+#define STUDIOLIGHT_ORIENTATIONS_SOLID (STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD)
 
 typedef struct StudioLight {
 	struct StudioLight *next, *prev;
@@ -89,7 +95,8 @@ typedef struct StudioLight {
 void BKE_studiolight_init(void);
 void BKE_studiolight_free(void);
 struct StudioLight *BKE_studiolight_find(const char *name, int flag);
-struct StudioLight *BKE_studiolight_findindex(int index);
+struct StudioLight *BKE_studiolight_findindex(int index, int flag);
+struct StudioLight *BKE_studiolight_find_first(int flag);
 unsigned int *BKE_studiolight_preview(StudioLight *sl, int icon_size, int icon_id_type);
 const struct ListBase *BKE_studiolight_listbase(void);
 void BKE_studiolight_ensure_flag(StudioLight *sl, int flag);