griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-07-08 18:40:13 +02:00
parent e4e119c9df bfacc42651
commit 145b2173bd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/intern/draw_manager.hh
View File

@@ -324,7 +324,7 @@ inline ResourceHandleRange Manager::unique_handle(const ObjectRef &ref)
inline ResourceHandleRange Manager::resource_handle(const ObjectRef &ref, float inflate_bounds)
{
bool is_active_object = ref.is_active(object_active);
bool is_edit_mode = DRW_object_is_in_edit_mode(object_active) &&
bool is_edit_mode = object_active && DRW_object_is_in_edit_mode(object_active) &&
ref.object->mode == object_active->mode;
matrix_buf.current().get_or_resize(resource_len_).sync(*ref.object);
bounds_buf.current().get_or_resize(resource_len_).sync(*ref.object, inflate_bounds);
@@ -338,7 +338,7 @@ inline ResourceHandle Manager::resource_handle(const ObjectRef &ref,
const float3 *bounds_half_extent)
{
bool is_active_object = ref.is_active(object_active);
bool is_edit_mode = DRW_object_is_in_edit_mode(object_active) &&
bool is_edit_mode = object_active && DRW_object_is_in_edit_mode(object_active) &&
ref.object->mode == object_active->mode;
if (model_matrix) {
matrix_buf.current().get_or_resize(resource_len_).sync(*model_matrix);
@@ -378,7 +378,7 @@ inline ResourceHandle Manager::resource_handle_for_psys(const ObjectRef &ref,
const float4x4 &model_matrix)
{
bool is_active_object = ref.is_active(object_active);
bool is_edit_mode = DRW_object_is_in_edit_mode(object_active) &&
bool is_edit_mode = object_active && DRW_object_is_in_edit_mode(object_active) &&
ref.object->mode == object_active->mode;
matrix_buf.current().get_or_resize(resource_len_).sync(model_matrix);
bounds_buf.current().get_or_resize(resource_len_).sync();