Commit: dcf4bf8db9ab29bb523bc84e963f56872576c0fc
Author: William Reynish
Date: Thu Nov 22 15:31:19 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBdcf4bf8db9ab29bb523bc84e963f56872576c0fc
Icons: use newly added icons
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/include/UI_icons.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_dynamicpaint.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/makesrna/intern/rna_wm.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py
b/release/scripts/startup/bl_ui/space_userpref.py
index e978a86dcea..a5e0a3c9779 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1210,8 +1210,8 @@ class USERPREF_PT_addons(Panel):
_support_icon_mapping = {
'OFFICIAL': 'FILE_BLEND',
- 'COMMUNITY': 'POSE_DATA',
- 'TESTING': 'MOD_EXPLODE',
+ 'COMMUNITY': 'COMUNITY',
+ 'TESTING': 'EXPERIMENTAL',
}
@classmethod
@@ -1354,7 +1354,7 @@ class USERPREF_PT_addons(Panel):
row.operator(
"wm.addon_expand",
- icon='TRIA_DOWN' if info["show_expanded"] else
'TRIA_RIGHT',
+ icon='DISCLOSURE_TRI_DOWN' if info["show_expanded"] else
'DISCLOSURE_TRI_RIGHT',
emboss=False,
).module = module_name
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 127cc58054f..8d5601b2db0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1579,8 +1579,8 @@ class VIEW3D_MT_image_add(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("object.load_reference_image", text="Reference")
- layout.operator("object.load_background_image", text="Background")
+ layout.operator("object.load_reference_image", text="Reference",
icon='IMAGE_REFERENCE')
+ layout.operator("object.load_background_image", text="Background",
icon='IMAGE_BACKGROUND')
class VIEW3D_MT_object_relations(Menu):
diff --git a/source/blender/editors/include/UI_icons.h
b/source/blender/editors/include/UI_icons.h
index 9d82e074415..c55032c9476 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -141,7 +141,7 @@ DEF_ICON_SHADING(TEXTURE)
DEF_ICON(ANIM)
DEF_ICON_SHADING(WORLD)
DEF_ICON(SCENE)
-DEF_ICON_BLANK(144)
+DEF_ICON(OUTPUT)
DEF_ICON_BLANK(145)
DEF_ICON_BLANK(146)
DEF_ICON(SCRIPT)
@@ -235,7 +235,7 @@ DEF_ICON(PARTICLE_DATA)
DEF_ICON(LIBRARY_DATA_DIRECT)
DEF_ICON_COLLECTION(GROUP)
DEF_ICON(ARMATURE_DATA)
-DEF_ICON(POSE_DATA)
+DEF_ICON(COMMUNITY)
DEF_ICON(BONE_DATA)
DEF_ICON_MODIFIER(CONSTRAINT)
DEF_ICON(SHAPEKEY_DATA)
@@ -243,7 +243,7 @@ DEF_ICON_MODIFIER(CONSTRAINT_BONE)
DEF_ICON(CAMERA_STEREO)
DEF_ICON(PACKAGE)
DEF_ICON(UGLYPACKAGE)
-DEF_ICON_BLANK(246)
+DEF_ICON(EXPERIMENTAL)
/* DATA */
DEF_ICON_SHADING(BRUSH_DATA)
@@ -369,15 +369,15 @@ DEF_ICON(MESH_CYLINDER)
DEF_ICON(MESH_TORUS)
DEF_ICON(MESH_CONE)
DEF_ICON(MESH_CAPSULE)
-DEF_ICON_BLANK(372)
+DEF_ICON(EMPTY_SINGLE_ARROW)
DEF_ICON_SHADING(LIGHT_POINT)
DEF_ICON_SHADING(LIGHT_SUN)
DEF_ICON_SHADING(LIGHT_SPOT)
DEF_ICON_SHADING(LIGHT_HEMI)
DEF_ICON_SHADING(LIGHT_AREA)
-DEF_ICON_BLANK(278)
-DEF_ICON_BLANK(379)
-DEF_ICON(META_EMPTY)
+DEF_ICON(CUBE)
+DEF_ICON(SPHERE)
+DEF_ICON(CONE)
DEF_ICON(META_PLANE)
DEF_ICON(META_CUBE)
DEF_ICON(META_BALL)
@@ -392,9 +392,9 @@ DEF_ICON(SURFACE_NSURFACE)
DEF_ICON(SURFACE_NCYLINDER)
DEF_ICON(SURFACE_NSPHERE)
DEF_ICON(SURFACE_NTORUS)
-DEF_ICON(GP_EMPTY)
-DEF_ICON(GP_STROKE)
-DEF_ICON_BLANK(397)
+DEF_ICON(EMPTY_AXIS)
+DEF_ICON(STROKE)
+DEF_ICON(EMPTY_ARROWS)
DEF_ICON(CURVE_BEZCURVE)
DEF_ICON(CURVE_BEZCIRCLE)
DEF_ICON(CURVE_NCURVE)
@@ -437,9 +437,9 @@ DEF_ICON_BLANK(679)
DEF_ICON_BLANK(680)
DEF_ICON_BLANK(681)
DEF_ICON_BLANK(682)
-DEF_ICON_BLANK(683)
-DEF_ICON_BLANK(684)
-DEF_ICON_BLANK(685)
+DEF_ICON(IMAGE_PLANE)
+DEF_ICON(IMAGE_BACKGROUND)
+DEF_ICON(IMAGE_REFERENCE)
/* EMPTY */
DEF_ICON_BLANK(445)
@@ -824,8 +824,8 @@ DEF_ICON(BACK)
DEF_ICON(FORWARD)
DEF_ICON_BLANK(825)
DEF_ICON_BLANK(826)
-DEF_ICON_BLANK(827)
-DEF_ICON_BLANK(828)
+DEF_ICON(FILE_PREFERENCES)
+DEF_ICON(FILE_VOLUME)
DEF_ICON(ALEMBIC)
DEF_ICON(VOLUME)
DEF_ICON(FILE_HIDDEN)
diff --git a/source/blender/makesrna/intern/rna_brush.c
b/source/blender/makesrna/intern/rna_brush.c
index fc443f6c2fc..d9b9677bbc6 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -117,7 +117,7 @@ const EnumPropertyItem rna_enum_brush_image_tool_items[] = {
};
const EnumPropertyItem rna_enum_brush_gpencil_types_items[] = {
- {GPAINT_TOOL_DRAW, "DRAW", ICON_GP_STROKE, "Draw", "The brush is of
type used for drawing strokes"},
+ {GPAINT_TOOL_DRAW, "DRAW", ICON_STROKE, "Draw", "The brush is of type
used for drawing strokes"},
{GPAINT_TOOL_FILL, "FILL", ICON_COLOR, "Fill", "The brush is of type
used for filling areas"},
{GPAINT_TOOL_ERASE, "ERASE", ICON_PANEL_CLOSE, "Erase", "The brush is
used for erasing strokes"},
{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/makesrna/intern/rna_camera.c
b/source/blender/makesrna/intern/rna_camera.c
index 60c68bc7214..1e68ab65965 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -233,7 +233,7 @@ static void rna_def_camera_background_image(BlenderRNA
*brna)
prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag",
CAM_BGIMG_FLAG_EXPANDED);
RNA_def_property_ui_text(prop, "Show Expanded", "Show the expanded in
the user interface");
- RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
+ RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
prop = RNA_def_property(srna, "use_camera_clip", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag",
CAM_BGIMG_FLAG_CAMERACLIP);
diff --git a/source/blender/makesrna/intern/rna_constraint.c
b/source/blender/makesrna/intern/rna_constraint.c
index 898852739eb..4116dd5753f 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -2648,7 +2648,7 @@ void RNA_def_constraint(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_EXPAND);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_ui_text(prop, "Expanded", "Constraint's panel is
expanded in UI");
- RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
+ RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
/* XXX this is really an internal flag, but it may be useful for some
tools to be able to access this... */
prop = RNA_def_property(srna, "is_valid", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c
b/source/blender/makesrna/intern/rna_dynamicpaint.c
index d24be434ea1..523a4e4ad6e 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.c
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@ -775,8 +775,8 @@ static void rna_def_dynamic_paint_brush_settings(BlenderRNA
*brna)
/* paint collision type */
static const EnumPropertyItem prop_dynamicpaint_collisiontype[] = {
{MOD_DPAINT_COL_PSYS, "PARTICLE_SYSTEM", ICON_PARTICLES,
"Particle System", ""},
- {MOD_DPAINT_COL_POINT, "POINT", ICON_META_EMPTY, "Object
Center", ""},
- {MOD_DPAINT_COL_DIST, "DISTANCE", ICON_META_EMPTY, "Proximity",
""},
+ {MOD_DPAINT_COL_POINT, "POINT", ICON_EMPTY_AXIS, "Object
Center", ""},
+ {MOD_DPAINT_COL_DIST, "DISTANCE", ICON_DRIVER_DISTANCE,
"Proximity", ""},
{MOD_DPAINT_COL_VOLDIST, "VOLUME_DISTANCE", ICON_META_CUBE,
"Mesh Volume + Proximity", ""},
{MOD_DPAINT_COL_VOLUME, "VOLUME", ICON_MESH_CUBE, "Mesh
Volume", ""},
{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/makesrna/intern/rna_fcurve.c
b/source/blender/makesrna/intern/rna_fcurve.c
index b4715075624..ef573079116 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -1395,7 +1395,7 @@ static void rna_def_fmodifier(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag",
FMODIFIER_FLAG_EXPANDED);
RNA_def_property_ui_text(prop, "Expanded", "F-Curve Modifier's panel is
expanded in UI");
- RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1);
+ RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_MUTED);
@@ -1424,7 +1424,7 @@ static void rna_def_fmodifier(BlenderRNA *brna)
"F-Curve Modifier is only applied for the
specified frame range to help "
"mask off effects in order to chain them");
RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME_PROP,
"rna_FModifier_update");
- RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1); /* XXX: depends on
UI implementation */
+ RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1); /* XXX:
depends on UI implementation */
prop = RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "sfra");
@@ -1457,7 +1457,7 @@ static void rna_def_fmodifier(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag",
FMODIFIER_FLAG_USEINFLUENCE);
RNA_def_property_ui_text(prop, "Use Influence", "F-Curve Modifier's
effects will be tempered by a default factor");
RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME_PROP,
"rna_FModifier_update");
- RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1); /* XXX: depends on
UI implementation */
+ RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1); /* XXX:
depends on UI implementation */
prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "influence");
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c
b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index aca68992b59..beba47f33b4 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -1628,7 +1628,7 @@ void RNA_def_greasepencil_modifier(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "mode",
eGpencilModifierMode_Expanded);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_ui_text(prop, "Expanded", "Set modifier expanded in
the user i
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
