blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

[WIP]tweak-experiment-experimental #119805

Draft
Richard Antalik wants to merge 46 commits from iss/blender:tweak-experiment-experimental into main
pull from: iss/blender:tweak-experiment-experimental
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 46 Files Changed 30 +3 -5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a74c28d31d - Show all commits

8
source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
View File

@ -71,7 +71,7 @@
/* Own include. */
#include "sequencer_intern.hh"
#define SEQ_HANDLE_SIZE 4.0f
#define SEQ_HANDLE_SIZE 5.0f
#define SEQ_SCROLLER_TEXT_OFFSET 8
#define MUTE_ALPHA 120
@ -872,8 +872,7 @@ static void draw_seq_outline(TimelineDrawContext *timeline_ctx, StripDrawContext
*/
const eSeqOverlapMode overlap_mode = SEQ_tool_settings_overlap_mode_get(timeline_ctx->scene);
if ((G.moving & G_TRANSFORM_SEQ) && (seq->flag & SELECT) &&
overlap_mode != SEQ_OVERLAP_OVERWRITE)
{
overlap_mode != SEQ_OVERLAP_OVERWRITE) {
if (seq->flag & SEQ_OVERLAP) {
col[0] = 255;
col[1] = col[2] = 33;
@ -1778,8 +1777,7 @@ static bool draw_cache_view_iter_fn(void *userdata,
size_t *vert_count;
if ((cache_type & SEQ_CACHE_STORE_FINAL_OUT) &&
(drawdata->cache_flag & SEQ_CACHE_VIEW_FINAL_OUT))
{
(drawdata->cache_flag & SEQ_CACHE_VIEW_FINAL_OUT)) {
stripe_bot = UI_view2d_region_to_view_y(v2d, V2D_SCROLL_HANDLE_HEIGHT);
vbo = drawdata->final_out_vbo;
vert_count = &drawdata->final_out_vert_count;