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

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed4e0b559a - Show all commits

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

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

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