Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f70171e9c6 - Show all commits

3
source/blender/blenkernel/intern/pbvh_pixels_copy.cc
View File

@ -93,7 +93,8 @@ static const Edge<CoordSpace::Tile> convert_coord_space(const Edge<CoordSpace::U
}; };
} }
class NonManifoldTileEdges : public Vector<Edge<CoordSpace::Tile>> {}; class NonManifoldTileEdges : public Vector<Edge<CoordSpace::Tile>> {
};
class NonManifoldUVEdges : public Vector<Edge<CoordSpace::UV>> { class NonManifoldUVEdges : public Vector<Edge<CoordSpace::UV>> {
public: public:

2
source/blender/editors/animation/anim_filter.c
View File

@ -264,7 +264,7 @@ static bool graphedit_get_context(bAnimContext *ac, SpaceGraph *sipo)
ac->ads = sipo->ads; ac->ads = sipo->ads;
/* set settings for Graph Editor - "Selected = Editable" */ /* set settings for Graph Editor - "Selected = Editable" */
if (U.animation_flag & USER_ANIM_ONLY_SHOW_SELECTED_CURVE_KEYS) { if (U.animation_flag & USER_ANIM_ONLY_SHOW_SELECTED_CURVE_KEYS) {
sipo->ads->filterflag |= ADS_FILTER_SELEDIT; sipo->ads->filterflag |= ADS_FILTER_SELEDIT;
} }
else { else {