Commit: 8f4ab480bfe81f40b59b20780cb452736fe3af1d
Author: Clément Foucault
Date: Wed Nov 28 22:16:56 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB8f4ab480bfe81f40b59b20780cb452736fe3af1d
Workbench: Rename orientation to type and Camera studio light to Studio
===================================================================
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/blenkernel/BKE_studiolight.h
M source/blender/blenkernel/intern/studiolight.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/engines/eevee/eevee_lookdev.c
M
source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
M
source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
M source/blender/draw/engines/workbench/workbench_data.c
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/editors/interface/interface_icons.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py
b/release/scripts/startup/bl_operators/wm.py
index 41a786a41da..4206adcfb91 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2432,11 +2432,11 @@ class WM_OT_studiolight_install(Operator):
default="*.png;*.jpg;*.hdr;*.exr",
options={'HIDDEN'},
)
- orientation: EnumProperty(
+ type: EnumProperty(
items=(
('MATCAP', "MatCap", ""),
('WORLD', "World", ""),
- ('CAMERA', "Camera", ""),
+ ('STUDIO', "Studio", ""),
)
)
@@ -2453,7 +2453,7 @@ class WM_OT_studiolight_install(Operator):
self.report({'ERROR'}, "Failed to get Studio Light path")
return {'CANCELLED'}
- path_studiolights = pathlib.Path(path_studiolights, "studiolights",
self.orientation.lower())
+ path_studiolights = pathlib.Path(path_studiolights, "studiolights",
self.type.lower())
if not path_studiolights.exists():
try:
path_studiolights.mkdir(parents=True, exist_ok=True)
@@ -2462,7 +2462,7 @@ class WM_OT_studiolight_install(Operator):
for filepath in filepaths:
shutil.copy(str(filepath), str(path_studiolights))
-
userpref.studio_lights.new(str(path_studiolights.joinpath(filepath.name)),
self.orientation)
+
userpref.studio_lights.new(str(path_studiolights.joinpath(filepath.name)),
self.type)
# print message
msg = (
diff --git a/release/scripts/startup/bl_ui/space_userpref.py
b/release/scripts/startup/bl_ui/space_userpref.py
index 4d961ef347a..72b07d55f70 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -45,9 +45,9 @@ class USERPREF_HT_header(Header):
layout.operator("wm.addon_refresh", icon='FILE_REFRESH')
layout.menu("USERPREF_MT_addons_online_resources")
elif userpref.active_section == 'LIGHTS':
- layout.operator('wm.studiolight_install', text="Add
MatCap").orientation = 'MATCAP'
- layout.operator('wm.studiolight_install', text="Add World
HDRI").orientation = 'WORLD'
- layout.operator('wm.studiolight_install', text="Add Camera
HDRI").orientation = 'CAMERA'
+ layout.operator('wm.studiolight_install', text="Add MatCap").type
= 'MATCAP'
+ layout.operator('wm.studiolight_install', text="Add LookDev
HDRI").type = 'WORLD'
+ layout.operator('wm.studiolight_install', text="Add Studio
Light").type = 'STUDIO'
elif userpref.active_section == 'THEMES':
layout.operator("wm.theme_install", icon='FILEBROWSER')
layout.operator("ui.reset_default_theme", icon='LOOP_BACK')
@@ -1492,7 +1492,7 @@ class StudioLightPanelMixin():
return (userpref.active_section == 'LIGHTS')
def _get_lights(self, userpref):
- return [light for light in userpref.studio_lights if
light.is_user_defined and light.orientation == self.sl_orientation]
+ return [light for light in userpref.studio_lights if
light.is_user_defined and light.type == self.sl_type]
def draw(self, context):
layout = self.layout
@@ -1518,22 +1518,17 @@ class StudioLightPanelMixin():
class USERPREF_PT_studiolight_matcaps(Panel, StudioLightPanelMixin):
bl_label = "MatCaps"
- sl_orientation = 'MATCAP'
+ sl_type = 'MATCAP'
class USERPREF_PT_studiolight_world(Panel, StudioLightPanelMixin):
- bl_label = "World HDRI"
- sl_orientation = 'WORLD'
-
-
-class USERPREF_PT_studiolight_camera(Panel, StudioLightPanelMixin):
- bl_label = "Camera HDRI"
- sl_orientation = 'CAMERA'
+ bl_label = "LookDev HDRIs"
+ sl_type = 'WORLD'
class USERPREF_PT_studiolight_lights(Panel, StudioLightPanelMixin):
bl_label = "Studio Lights"
- sl_orientation = 'CAMERA'
+ sl_type = 'STUDIO'
@classmethod
def poll(cls, context):
@@ -1593,7 +1588,6 @@ classes = (
USERPREF_PT_studiolight_lights,
USERPREF_PT_studiolight_matcaps,
USERPREF_PT_studiolight_world,
- USERPREF_PT_studiolight_camera,
)
if __name__ == "__main__": # only for live edit.
diff --git a/source/blender/blenkernel/BKE_studiolight.h
b/source/blender/blenkernel/BKE_studiolight.h
index 7ec98c99c3f..6616af355ac 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -82,9 +82,9 @@ enum StudioLightFlag {
/* STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED = (1 << 1), */
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_TYPE_STUDIO = (1 << 4),
+ STUDIOLIGHT_TYPE_WORLD = (1 << 5),
+ STUDIOLIGHT_TYPE_MATCAP = (1 << 6),
STUDIOLIGHT_EXTERNAL_IMAGE_LOADED = (1 << 7),
STUDIOLIGHT_EQUIRECT_IRRADIANCE_IMAGE_CALCULATED = (1 << 8),
STUDIOLIGHT_EQUIRECT_RADIANCE_GPUTEXTURE = (1 << 9),
@@ -95,9 +95,9 @@ enum 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_ORIENTATION_WORLD)
-#define STUDIOLIGHT_ORIENTATIONS_SOLID (STUDIOLIGHT_INTERNAL |
STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD)
+#define STUDIOLIGHT_FLAG_ORIENTATIONS (STUDIOLIGHT_TYPE_STUDIO |
STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_TYPE_MATCAP)
+#define STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE (STUDIOLIGHT_TYPE_WORLD)
+#define STUDIOLIGHT_ORIENTATIONS_SOLID (STUDIOLIGHT_INTERNAL |
STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_TYPE_WORLD)
typedef void StudioLightFreeFunction(struct StudioLight *, void *data);
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index f949fcaea07..937c24c47e6 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -82,7 +82,7 @@ static int last_studiolight_id = 0;
*/
#define STUDIOLIGHT_LOAD_CACHED_FILES
-static const char *STUDIOLIGHT_CAMERA_FOLDER = "studiolights/camera/";
+static const char *STUDIOLIGHT_LIGHTS_FOLDER = "studiolights/light/";
static const char *STUDIOLIGHT_WORLD_FOLDER = "studiolights/world/";
static const char *STUDIOLIGHT_MATCAP_FOLDER = "studiolights/matcap/";
@@ -168,7 +168,7 @@ static struct StudioLight *studiolight_create(int flag)
sl->free_function = NULL;
sl->flag = flag;
sl->index = ++last_studiolight_id;
- if (flag & STUDIOLIGHT_ORIENTATION_VIEWNORMAL) {
+ if (flag & STUDIOLIGHT_TYPE_MATCAP) {
sl->icon_id_matcap = BKE_icon_ensure_studio_light(sl,
STUDIOLIGHT_ICON_ID_TYPE_MATCAP);
sl->icon_id_matcap_flipped = BKE_icon_ensure_studio_light(sl,
STUDIOLIGHT_ICON_ID_TYPE_MATCAP_FLIPPED);
}
@@ -263,7 +263,7 @@ static void
studiolight_create_equirect_radiance_gputexture(StudioLight *sl)
BKE_studiolight_ensure_flag(sl,
STUDIOLIGHT_EXTERNAL_IMAGE_LOADED);
ImBuf *ibuf = sl->equirect_radiance_buffer;
- if (sl->flag & STUDIOLIGHT_ORIENTATION_VIEWNORMAL) {
+ if (sl->flag & STUDIOLIGHT_TYPE_MATCAP) {
float *gpu_matcap_3components =
MEM_callocN(sizeof(float[3]) * ibuf->x * ibuf->y, __func__);
float (*offset4)[4] = (float (*)[4])ibuf->rect_float;
@@ -1010,7 +1010,7 @@ void BKE_studiolight_init(void)
/* order studio lights by name */
/* Also reserve icon space for it. */
/* Add default studio light */
- sl = studiolight_create(STUDIOLIGHT_INTERNAL |
STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED |
STUDIOLIGHT_ORIENTATION_CAMERA);
+ sl = studiolight_create(STUDIOLIGHT_INTERNAL |
STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED |
STUDIOLIGHT_TYPE_STUDIO);
BLI_strncpy(sl->name, "Default", FILE_MAXFILE);
int i = 0;
@@ -1030,12 +1030,12 @@ void BKE_studiolight_init(void)
BLI_addtail(&studiolights, sl);
- studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA);
- studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA |
STUDIOLIGHT_USER_DEFINED);
- studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD);
- studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD |
STUDIOLIGHT_USER_DEFINED);
- studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_ORIENTATION_VIEWNORMAL);
- studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_ORIENTATION_VIEWNORMAL |
STUDIOLIGHT_USER_DEFINED);
+ studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_LIGHTS_FOLDER, STUDIOLIGHT_TYPE_STUDIO);
+ studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_LIGHTS_FOLDER, STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_USER_DEFINED);
+ studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_TYPE_WORLD);
+ studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_USER_DEFINED);
+ studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES,
STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_TYPE_MATCAP);
+ studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_TYPE_MATCAP | STUDIOLIGHT_USER_DEFINED);
/* sort studio lights on filename. */
BLI_listbase_sort(&studiolights, studiolight_cmp);
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
