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

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +19 -11
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92f79e002e - Show all commits

16
scripts/startup/bl_ui/properties_data_curve.py
View File

@ -371,10 +371,18 @@ class DATA_PT_font(CurveButtonsPanelText, Panel):
row.prop(char, "use_small_caps", toggle=True) row.prop(char, "use_small_caps", toggle=True)
else: else:
row = layout.row(align=True) row = layout.row(align=True)
row.operator("font.style_toggle", text="Bold", icon='BOLD' , depress = text.is_select_bold).style = 'BOLD' row.operator(
row.operator("font.style_toggle", text="Italic", icon='ITALIC' , depress = text.is_select_italic).style = 'ITALIC' "font.style_toggle", text="Bold", icon='BOLD', depress=text.is_select_bold,
row.operator("font.style_toggle", text="Underline", icon='UNDERLINE' , depress = text.is_select_underline).style = 'UNDERLINE' ).style = 'BOLD'
row.operator("font.style_toggle", text="Small Caps", icon='SMALL_CAPS' , depress = text.is_select_smallcaps).style = 'SMALL_CAPS' row.operator(
"font.style_toggle", text="Italic", icon='ITALIC', depress=text.is_select_italic,
).style = 'ITALIC'
row.operator(
"font.style_toggle", text="Underline", icon='UNDERLINE', depress=text.is_select_underline,
).style = 'UNDERLINE'
row.operator(
"font.style_toggle", text="Small Caps", icon='SMALL_CAPS', depress=text.is_select_smallcaps,
).style = 'SMALL_CAPS'
class DATA_PT_font_transform(CurveButtonsPanelText, Panel): class DATA_PT_font_transform(CurveButtonsPanelText, Panel):

5
scripts/startup/bl_ui/space_node.py
View File

@ -903,7 +903,10 @@ class NodeTreeInterfacePanel(Panel):
props = property_row.operator_menu_enum( props = property_row.operator_menu_enum(
"node.tree_socket_change_subtype", "node.tree_socket_change_subtype",
"socket_subtype", "socket_subtype",
text=active_socket.bl_subtype_label if active_socket.bl_subtype_label else active_socket.bl_idname text=(
active_socket.bl_subtype_label if active_socket.bl_subtype_label else
active_socket.bl_idname
),
) )
layout.use_property_split = True layout.use_property_split = True

4
source/blender/geometry/intern/realize_instances.cc
View File

@ -939,8 +939,8 @@ static AllMeshesInfo preprocess_meshes(const GeometrySet &geometry_set,
mesh_info.stored_vertex_ids = ids_attribute.varray.get_internal_span().typed<int>(); mesh_info.stored_vertex_ids = ids_attribute.varray.get_internal_span().typed<int>();
} }
} }
mesh_info.material_indices =* mesh_info.material_indices = *attributes.lookup_or_default<int>(
attributes.lookup_or_default<int>("material_index", ATTR_DOMAIN_FACE, 0); "material_index", ATTR_DOMAIN_FACE, 0);
} }
info.no_loose_edges_hint = std::all_of( info.no_loose_edges_hint = std::all_of(

5
source/blender/io/collada/MeshImporter.h
View File

@ -92,10 +92,7 @@ class MeshImporter : public MeshImporterBase {
* A pair/of geom UID and mat UID, one geometry can have several materials. */ * A pair/of geom UID and mat UID, one geometry can have several materials. */
std::multimap<COLLADAFW::UniqueId, COLLADAFW::UniqueId> materials_mapped_to_geom; std::multimap<COLLADAFW::UniqueId, COLLADAFW::UniqueId> materials_mapped_to_geom;
bool set_poly_indices(int *poly_verts, bool set_poly_indices(int *poly_verts, int loop_index, const uint *indices, int loop_count);
int loop_index,
const uint *indices,
int loop_count);
void set_face_uv(blender::float2 *mloopuv, void set_face_uv(blender::float2 *mloopuv,
UVDataWrapper &uvs, UVDataWrapper &uvs,