bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.5-release'

Browse Source
This commit is contained in:
Hans Goudey 2023-03-15 12:14:13 -04:00
commit ed4e0b559a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/startup/bl_operators/object_quick_effects.py
View File

@ -138,10 +138,10 @@ class QuickFur(ObjectModeOperator, Operator):
generate_modifier.node_group = generate_group
generate_modifier["Input_2"] = mesh_object
generate_modifier["Input_18_attribute_name"] = curves.surface_uv_map
generate_modifier["Input_12"] = True
generate_modifier["Input_20"] = self.length
generate_modifier["Input_22"] = material
generate_modifier["Input_15"] = density * 0.01
curves_object.modifiers.move(1, 0)
radius_modifier = curves_object.modifiers.new(name="Set Hair Curve Profile", type='NODES')
radius_modifier.node_group = radius_group
@ -151,6 +151,7 @@ class QuickFur(ObjectModeOperator, Operator):
interpolate_modifier.node_group = interpolate_group
interpolate_modifier["Input_2"] = mesh_object
interpolate_modifier["Input_18_attribute_name"] = curves.surface_uv_map
interpolate_modifier["Input_12"] = True
interpolate_modifier["Input_15"] = density
interpolate_modifier["Input_17"] = self.view_percentage
interpolate_modifier["Input_24"] = True
@ -167,6 +168,8 @@ class QuickFur(ObjectModeOperator, Operator):
with context.temp_override(object=curves_object):
bpy.ops.object.modifier_apply(modifier=generate_modifier.name)
curves_object.modifiers.move(0, len(curves_object.modifiers) - 1)
return {'FINISHED'}

4
source/blender/blenkernel/intern/mball_tessellate.cc
View File

@ -39,8 +39,8 @@
#include "BLI_strict_flags.h"
/* experimental (faster) normal calculation */
// #define USE_ACCUM_NORMAL
/* experimental (faster) normal calculation (see #103021) */
#define USE_ACCUM_NORMAL
#define MBALL_ARRAY_LEN_INIT 4096