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

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +17 -9
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6aa1b5d031 - Show all commits

1
release/lts/lts_issue.py
View File

@ -3,6 +3,7 @@
import requests import requests
class ReleaseLogLine: class ReleaseLogLine:
""" """
Class containing the information of a single line of the release log Class containing the information of a single line of the release log

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -6344,6 +6344,8 @@ def km_node_link_modal_map(_params):
return keymap return keymap
# Fallback for gizmos that don't have custom a custom key-map. # Fallback for gizmos that don't have custom a custom key-map.
def km_generic_gizmo(_params): def km_generic_gizmo(_params):
keymap = ( keymap = (
"Generic Gizmo", "Generic Gizmo",

19
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -2319,13 +2319,18 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
bl_label = "New Features" bl_label = "New Features"
def draw(self, context): def draw(self, context):
self._draw_items( self._draw_items(context,
context, ( (({"property": "use_sculpt_tools_tilt"},
({"property": "use_sculpt_tools_tilt"}, ("blender/blender/issues/82877", "#82877")), ("blender/blender/issues/82877",
({"property": "use_extended_asset_browser"}, ("blender/blender/projects/10", "Pipeline, Assets & IO Project Page")), "#82877")),
({"property": "use_override_templates"}, ("blender/blender/issues/73318", "Milestone 4")), ({"property": "use_extended_asset_browser"},
), ("blender/blender/projects/10",
) "Pipeline, Assets & IO Project Page")),
({"property": "use_override_templates"},
("blender/blender/issues/73318",
"Milestone 4")),
),
)
class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel): class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):

1
source/blender/editors/include/ED_curves.h
View File

@ -146,7 +146,6 @@ bool select_pick(const ViewContext &vc,
const SelectPick_Params &params, const SelectPick_Params &params,
const int2 mval); const int2 mval);
/** \} */ /** \} */
} // namespace blender::ed::curves } // namespace blender::ed::curves

3
source/blender/editors/space_view3d/view3d_select.cc
View File

@ -3550,7 +3550,8 @@ static bool do_mesh_box_select(ViewContext *vc,
} }
if (ts->selectmode & SCE_SELECT_EDGE) { if (ts->selectmode & SCE_SELECT_EDGE) {
/* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */ /* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */
struct BoxSelectUserData_ForMeshEdge cb_data {}; struct BoxSelectUserData_ForMeshEdge cb_data {
};
cb_data.data = &data; cb_data.data = &data;
cb_data.esel = use_zbuf ? esel : nullptr; cb_data.esel = use_zbuf ? esel : nullptr;
cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem( cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem(