diff options
author | Pablo Vazquez <pablo@blender.org> | 2021-11-05 18:23:56 +0300 |
---|---|---|
committer | Pablo Vazquez <pablo@blender.org> | 2021-11-05 18:23:56 +0300 |
commit | bbd8d33453fca1be05bced39dcbff5ee02fa8da3 (patch) | |
tree | 878563268d8ae736ce82f6eb2d17e32209acf53e | |
parent | f415b41a94ceedf1a43cb53500cb0dcf57522bb2 (diff) | |
parent | 7c755293330e8ebe8717b0a34e6031b4e3186f0d (diff) |
Merge branch 'blender-v3.0-release'
-rw-r--r-- | source/blender/blenkernel/intern/object.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 27 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 2 |
6 files changed, 8 insertions, 31 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index a63f0091586..75d204a46e4 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -5848,7 +5848,7 @@ void BKE_object_replace_data_on_shallow_copy(Object *ob, ID *new_data) ob->type = BKE_object_obdata_to_type(new_data); ob->data = (void *)new_data; ob->runtime.geometry_set_eval = nullptr; - ob->runtime.data_eval = nullptr; + ob->runtime.data_eval = new_data; if (ob->runtime.bb != nullptr) { ob->runtime.bb->flag |= BOUNDBOX_DIRTY; } diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 61da496d344..c3a00bedaf8 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -39,6 +39,10 @@ typedef enum { #define BIFICONID_FIRST (ICON_NONE) +/* Removed icon no longer used, defined so that add-ons don't have to be \ + * updated. */ +#define ICON_SMALL_TRI_RIGHT_VEC (ICON_RIGHTARROW) + /* use to denote intentionally unset theme color */ #define TH_UNDEFINED -1 diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index c20129b4184..5784af90834 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -259,31 +259,6 @@ static void viconutil_set_point(int pt[2], int x, int y) pt[1] = y; } -static void vicon_small_tri_right_draw(int x, int y, int w, int UNUSED(h), float alpha) -{ - int pts[3][2]; - const int cx = x + w / 2 - 4; - const int cy = y + w / 2; - const int d = w / 5, d2 = w / 7; - - viconutil_set_point(pts[0], cx - d2, cy + d); - viconutil_set_point(pts[1], cx - d2, cy - d); - viconutil_set_point(pts[2], cx + d2, cy); - - uint pos = GPU_vertformat_attr_add( - immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT); - immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); - immUniformColor4f(0.2f, 0.2f, 0.2f, alpha); - - immBegin(GPU_PRIM_TRIS, 3); - immVertex2iv(pos, pts[0]); - immVertex2iv(pos, pts[1]); - immVertex2iv(pos, pts[2]); - immEnd(); - - immUnbindProgram(); -} - static void vicon_keytype_draw_wrapper( int x, int y, int w, int h, float alpha, short key_type, short handle_type) { @@ -982,8 +957,6 @@ static void init_internal_icons(void) } } - def_internal_vicon(ICON_SMALL_TRI_RIGHT_VEC, vicon_small_tri_right_draw); - def_internal_vicon(ICON_KEYTYPE_KEYFRAME_VEC, vicon_keytype_keyframe_draw); def_internal_vicon(ICON_KEYTYPE_BREAKDOWN_VEC, vicon_keytype_breakdown_draw); def_internal_vicon(ICON_KEYTYPE_EXTREME_VEC, vicon_keytype_extreme_draw); diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 600b04f8563..f5107cb13fd 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -1225,7 +1225,7 @@ static void buttons_panel_context_draw(const bContext *C, Panel *panel) /* Add > triangle. */ if (!first) { - uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); + uiItemL(row, "", ICON_RIGHTARROW); } if (ptr->data == NULL) { diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 7c116a00eae..41f74b6ade9 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -942,7 +942,7 @@ static void graph_draw_driven_property_panel(uiLayout *layout, ID *id, FCurve *f uiItemL(row, id->name + 2, icon); /* -> user friendly 'name' for F-Curve/driver target */ - uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); + uiItemL(row, "", ICON_RIGHTARROW); uiItemL(row, name, ICON_RNA); } diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 215e865d194..81932589663 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -312,7 +312,7 @@ static void nla_panel_animdata(const bContext *C, Panel *panel) uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT); uiItemL(row, id->name + 2, RNA_struct_ui_icon(id_ptr.type)); /* id-block (src) */ - uiItemL(row, "", ICON_SMALL_TRI_RIGHT_VEC); /* expander */ + uiItemL(row, "", ICON_RIGHTARROW); /* expander */ uiItemL(row, IFACE_("Animation Data"), ICON_ANIM_DATA); /* animdata */ uiItemS(layout); |