blender
/
blender
133
398
Fork 579
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Nodes: Move preview images to an overlay #108001

Merged
Brecht Van Lommel merged 44 commits from Kdaf/blender:main into main 2023-07-12 16:14:21 +02:00
Conversation 47 Commits 44 Files Changed 10 +110 -70

44 Commits

Author SHA1 Message Date
Colin Marmond b1add2dac6 Merge remote-tracking branch 'origin/main' into main
buildbot/vexp-code-patch-coordinator Build done. Details
2023-07-11 14:09:42 +02:00
Colin Marmond bcaf74e52f Address comments about coding style 2023-07-10 13:58:52 +02:00
Colin Marmond 80824440d9 Merge remote-tracking branch 'origin/main' 2023-07-10 13:41:58 +02:00
Colin Marmond e6d661dfaf Merge remote-tracking branch 'origin/main' into main 2023-07-07 14:20:40 +02:00
Colin Marmond 0abd58f589 Revert modifying the totr rectangle 
It was going to be more difficult to find bug and misbehaving.
 2023-07-07 14:17:56 +02:00
Colin Marmond 2dce586dde Fix vertical previews and runtime preview pointer 2023-07-07 09:44:38 +02:00
Colin Marmond f5d54de9e2 I should more verify what I commit ;( 2023-07-06 17:43:42 +02:00
Colin Marmond 7bf40330c5 Addressing comments 2023-07-06 17:40:30 +02:00
Colin Marmond 1b0e24f074 apply format 2023-07-06 17:19:08 +02:00
Colin Marmond 3369d8c52f Merging error 2023-07-06 17:15:17 +02:00
Colin Marmond 8c2d316bfb Merge remote-tracking branch 'origin/main' 2023-07-06 17:10:12 +02:00
Colin Marmond 39639ce168 Update to latest changes 2023-07-06 17:09:27 +02:00
Colin Marmond 0d3d27ac57 Merge branch 'fix-node-overlay-clipping' 2023-07-06 17:05:22 +02:00
Colin Marmond 7e93644fc5 Update node's rect according to the overlay's size 2023-07-06 17:02:48 +02:00
Colin Marmond e0a7de604e Merge remote-tracking branch 'origin/main' 2023-07-06 11:41:40 +02:00
Colin Marmond a2bd34a10a Revert "Merge remote-tracking branch 'origin-push/main' into main" 
This reverts commit 9a3ec04772.
 2023-07-05 07:58:05 +02:00
Colin Marmond 9a3ec04772 Merge remote-tracking branch 'origin-push/main' into main 2023-07-05 07:48:56 +02:00
Colin Marmond f865ccedbd Make format 2023-07-05 07:45:19 +02:00
Colin Marmond 0099874654 Versioning 2023-07-05 07:45:19 +02:00
Colin Marmond b8c7e3e97c Fix merge conflicts 2023-07-05 07:45:19 +02:00
Colin Marmond 1666d76328 Merging main gone wrong at a moment. 2023-07-05 07:45:19 +02:00
Colin Marmond 7ed77545b6 Add preview option from nodeArea options. 
Little corrections too.
 2023-07-05 07:45:19 +02:00
Colin Marmond cc8b523ff3 Moving the preview to the extra_info overlay. 2023-07-05 07:45:19 +02:00
Colin Marmond e04f9d48d7 Revert "Exchange the extra infos list and the preview area because the preview area should stay atop the node without moving (even with extra infos)." 
This reverts commit 7430e6c0495b54f962b738985a66f23fb488f321.
 2023-07-05 07:45:19 +02:00
Colin Marmond 276fc2e8d6 Renaming 2023-07-05 07:45:18 +02:00
Colin Marmond 2c46f2488a Fix a little oversight. 2023-07-05 07:45:18 +02:00
Colin Marmond 5b88c6f77c Exchange the extra infos list and the preview area because the preview area should stay atop the node without moving (even with extra infos). 2023-07-05 07:45:18 +02:00
Colin Marmond 1f8223cfc5 Addressing comments. 2023-07-05 07:45:18 +02:00
Colin Marmond 1934c4d6e2 Small typing correction and apply format 2023-07-05 07:45:18 +02:00
Colin Marmond 22f54eeef2 Move node previews to the tooltips above each nodes. 2023-07-05 07:45:18 +02:00
Colin Marmond 4e3da7898c Make format 2023-07-04 20:00:41 +02:00
Colin Marmond 2e2dc00676 Merge remote-tracking branch 'origin/main' 2023-07-04 19:58:47 +02:00
Colin Marmond c7f8cab20c Versioning 2023-06-18 17:39:25 +02:00
Colin Marmond 32b08d89ac Fix merge conflicts 2023-06-18 17:04:09 +02:00
Colin Marmond a95c79772e Merging main gone wrong at a moment. 2023-06-18 16:55:50 +02:00
Colin Marmond bd3fc82e35 Add preview option from nodeArea options. 
Little corrections too.
 2023-06-18 16:55:26 +02:00
Colin Marmond 4918fbfce9 Moving the preview to the extra_info overlay. 2023-06-18 16:48:48 +02:00
Colin Marmond bed57c7c61 Revert "Exchange the extra infos list and the preview area because the preview area should stay atop the node without moving (even with extra infos)." 
This reverts commit 7430e6c0495b54f962b738985a66f23fb488f321.
 2023-06-18 16:48:46 +02:00
Colin Marmond 28b0ed6723 Renaming 2023-06-18 16:48:43 +02:00
Colin Marmond 7787640289 Fix a little oversight. 2023-06-18 16:48:41 +02:00
Colin Marmond 1516733934 Exchange the extra infos list and the preview area because the preview area should stay atop the node without moving (even with extra infos). 2023-06-18 16:48:38 +02:00
Colin Marmond 3a7fbe7c15 Addressing comments. 2023-06-18 16:48:36 +02:00
Colin Marmond 602cc851fc Small typing correction and apply format 2023-06-18 16:48:34 +02:00
Colin Marmond b6822ae912 Move node previews to the tooltips above each nodes. 2023-06-18 16:48:31 +02:00