Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

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

1
source/blender/gpu/intern/gpu_material.c
View File

@ -754,7 +754,6 @@ bool GPU_material_optimization_ready(GPUMaterial *mat)
void GPU_material_set_default(GPUMaterial *material, GPUMaterial *default_material) void GPU_material_set_default(GPUMaterial *material, GPUMaterial *default_material)
{ {
BLI_assert(material != default_material);
if (material != default_material) { if (material != default_material) {
material->default_mat = default_material; material->default_mat = default_material;
} }