blender
/
blender
134
425
Fork 607
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Geometry Nodes: new repeat zone #109164

Merged
Jacques Lucke merged 98 commits from JacquesLucke/blender:serial-loop into main 2023-07-11 22:36:17 +02:00
Conversation 25 Commits 98 Files Changed 47 +5 -7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5876a6c4ea - Show all commits

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -25,7 +25,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 7
#define BLENDER_FILE_SUBVERSION 8
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file

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

@ -3957,10 +3957,6 @@ void psys_mat_hair_to_orco(
psys_particle_on_dm(
mesh, from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, vec, 0, 0, 0, orco);
/* see psys_face_mat for why this function is called */
if (CustomData_get_layer(&mesh->vdata, CD_ORIGINDEX)) {
BKE_mesh_orco_verts_transform(static_cast<Mesh *>(ob->data), &orco, 1, 1);
}
copy_v3_v3(hairmat[3], orco);
}

6
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -97,6 +97,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology);
}
if (!USER_VERSION_ATLEAST(306, 8)) {
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_simulation);
FROM_DEFAULT_V4_UCHAR(space_action.simulated_frames);
}
/**
* Versioning code until next subversion bump goes here.
*
@ -108,8 +112,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_simulation);
FROM_DEFAULT_V4_UCHAR(space_action.simulated_frames);
}
#undef FROM_DEFAULT_V4_UCHAR