Commit: 9ccf27d1f760ab2562d96694c0823b35935bd9a3
Author: Clément Foucault
Date: Fri Nov 30 14:10:20 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB9ccf27d1f760ab2562d96694c0823b35935bd9a3
StudioLight: Renaming stuffs
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/draw/engines/workbench/workbench_studiolight.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py
b/release/scripts/startup/bl_ui/space_userpref.py
index 557948504d7..56accc902f4 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1560,8 +1560,8 @@ class USERPREF_PT_studiolight_lights(Panel,
StudioLightPanelMixin):
self.draw_light_list(layout, lights)
-class USERPREF_PT_studiolight_lights_editor(Panel):
- bl_label = "Studio Lights Editor"
+class USERPREF_PT_studiolight_light_editor(Panel):
+ bl_label = "Studio Light Editor"
bl_parent_id = "USERPREF_PT_studiolight_lights"
bl_space_type = 'USER_PREFERENCES'
bl_region_type = 'WINDOW'
@@ -1584,14 +1584,14 @@ class USERPREF_PT_studiolight_lights_editor(Panel):
system = userpref.system
row = layout.row()
- row.prop(system, "edit_solid_light", toggle=True)
+ row.prop(system, "edit_studio_light", toggle=True)
row.operator('wm.studiolight_new', text="Save as Studio light",
icon="FILE_TICK")
layout.separator()
layout.use_property_split = True
column = layout.split()
- column.active = system.edit_solid_light
+ column.active = system.edit_studio_light
light = system.solid_lights[0]
colsplit = column.split(factor=0.85)
@@ -1628,7 +1628,7 @@ classes = (
USERPREF_MT_addons_online_resources,
USERPREF_PT_addons,
USERPREF_PT_studiolight_lights,
- USERPREF_PT_studiolight_lights_editor,
+ USERPREF_PT_studiolight_light_editor,
USERPREF_PT_studiolight_matcaps,
USERPREF_PT_studiolight_world,
)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 4900ed6e631..eb0892503a6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4218,11 +4218,11 @@ class VIEW3D_PT_shading_lighting(Panel):
userpref = context.user_preferences
system = userpref.system
- if not system.edit_solid_light:
+ if not system.edit_studio_light:
sub.scale_y = 0.6 # smaller studiolight preview
sub.template_icon_view(shading, "studio_light", scale=3)
else:
- sub.prop(system, "edit_solid_light", text="Disable Studio
Light Edit", icon="NONE", toggle=True)
+ sub.prop(system, "edit_studio_light", text="Disable Studio
Light Edit", icon="NONE", toggle=True)
col = split.column()
col.operator('wm.studiolight_userpref_show', emboss=False,
text="", icon='PREFERENCES')
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c
b/source/blender/draw/engines/workbench/workbench_studiolight.c
index 63fc096ab0f..52a0e6045c6 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -47,7 +47,7 @@ void studiolight_update_world(WORKBENCH_PrivateData *wpd,
StudioLight *studiolig
unit_m4(rot_matrix);
}
- if (U.edit_solid_light) {
+ if (U.edit_studio_light) {
studiolight = BKE_studiolight_studio_edit_get();
}
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index 8fc7c0ed326..2e3baa27898 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -591,7 +591,7 @@ typedef struct UserDef {
struct SolidLight light_param[4];
float light_ambient[3], pad7;
short gizmo_flag, gizmo_size;
- short edit_solid_light;
+ short edit_studio_light;
short pad6[2];
short textimeout, texcollectrate;
short dragthreshold;
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index 416689f403f..a77fe62d155 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3488,11 +3488,11 @@ static void rna_def_userdef_solidlight(BlenderRNA *brna)
srna = RNA_def_struct(brna, "UserSolidLight", NULL);
RNA_def_struct_sdna(srna, "SolidLight");
RNA_def_struct_clear_flag(srna, STRUCT_UNDO);
- RNA_def_struct_ui_text(srna, "Solid Light", "Light used for OpenGL
lighting in solid draw mode");
+ RNA_def_struct_ui_text(srna, "Solid Light", "Light used for Studio
lighting in solid draw mode");
prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", 1);
- RNA_def_property_ui_text(prop, "Enabled", "Enable this OpenGL light in
solid draw mode");
+ RNA_def_property_ui_text(prop, "Enabled", "Enable this light in solid
draw mode");
RNA_def_property_update(prop, 0, "rna_UserDef_viewport_lights_update");
prop = RNA_def_property(srna, "smooth", PROP_FLOAT, PROP_FACTOR);
@@ -3506,7 +3506,7 @@ static void rna_def_userdef_solidlight(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "vec");
RNA_def_property_array(prop, 3);
RNA_def_property_float_array_default(prop, default_dir);
- RNA_def_property_ui_text(prop, "Direction", "Direction that the OpenGL
light is shining");
+ RNA_def_property_ui_text(prop, "Direction", "Direction that the light
is shining");
RNA_def_property_update(prop, 0, "rna_UserDef_viewport_lights_update");
prop = RNA_def_property(srna, "specular_color", PROP_FLOAT, PROP_COLOR);
@@ -4314,10 +4314,10 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Ambient Color", "Color of the ambient
light that uniformly lit the scene");
RNA_def_property_update(prop, 0, "rna_UserDef_viewport_lights_update");
- prop = RNA_def_property(srna, "edit_solid_light", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "edit_solid_light", 1);
- RNA_def_property_ui_text(prop, "Edit Solid Light",
- "View the result of the solid lights in
the viewport");
+ prop = RNA_def_property(srna, "edit_studio_light", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "edit_studio_light", 1);
+ RNA_def_property_ui_text(prop, "Edit Studio Light",
+ "View the result of the studio light
editor in the viewport");
RNA_def_property_update(prop, 0, "rna_UserDef_viewport_lights_update");
prop = RNA_def_property(srna, "use_weight_color_range", PROP_BOOLEAN,
PROP_NONE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
