blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Germano Cavalcante 2021-11-01 11:58:11 -03:00
parent 8fbbd69946 c0fbbc53e8
commit 6acba759e0
3 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/animation/keyframes_draw.c
View File

@ -30,7 +30,6 @@
#include "BLI_dlrbTree.h"
#include "BLI_listbase.h"
#include "BLI_rect.h"
#include "BLI_task.h"
#include "DNA_anim_types.h"
#include "DNA_gpencil_types.h"
@ -505,25 +504,12 @@ AnimKeylistDrawList *ED_keylist_draw_list_create(void)
return MEM_callocN(sizeof(AnimKeylistDrawList), __func__);
}
static void ED_keylist_draw_list_elem_build_task(void *__restrict UNUSED(userdata),
void *item,
int UNUSED(index),
const TaskParallelTLS *__restrict UNUSED(tls))
{
AnimKeylistDrawListElem *elem = item;
ED_keylist_draw_list_elem_build_keylist(elem);
ED_keylist_draw_list_elem_prepare_for_drawing(elem);
}
static void ED_keylist_draw_list_build_keylists(AnimKeylistDrawList *draw_list)
{
TaskParallelSettings settings;
BLI_parallel_range_settings_defaults(&settings);
/* Create a task per item, a single item is complex enough to deserve its own task. */
settings.min_iter_per_thread = 1;
BLI_task_parallel_listbase(
&draw_list->channels, NULL, ED_keylist_draw_list_elem_build_task, &settings);
LISTBASE_FOREACH (AnimKeylistDrawListElem *, elem, &draw_list->channels) {
ED_keylist_draw_list_elem_build_keylist(elem);
ED_keylist_draw_list_elem_prepare_for_drawing(elem);
}
}
static void ED_keylist_draw_list_draw_blocks(AnimKeylistDrawList *draw_list, View2D *v2d)

24
source/blender/editors/include/ED_transform_snap_object_context.h
View File

@ -142,18 +142,18 @@ short ED_transform_snap_object_project_view3d_ex(struct SnapObjectContext *sctx,
struct Object **r_ob,
float r_obmat[4][4],
float r_face_nor[3]);
bool ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
struct Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
/* return args */
float r_loc[3],
float r_no[3]);
short ED_transform_snap_object_project_view3d(struct SnapObjectContext *sctx,
struct Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
/* return args */
float r_loc[3],
float r_no[3]);
bool ED_transform_snap_object_project_all_view3d_ex(SnapObjectContext *sctx,
struct Depsgraph *depsgraph,

24
source/blender/editors/transform/transform_snap_object.c
View File

@ -3254,17 +3254,17 @@ short ED_transform_snap_object_project_view3d_ex(SnapObjectContext *sctx,
* \param r_no: hit normal (optional).
* \return Snap success
*/
bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const ushort snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
float r_loc[3],
float r_no[3])
short ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
Depsgraph *depsgraph,
const ARegion *region,
const View3D *v3d,
const ushort snap_to,
const struct SnapObjectParams *params,
const float mval[2],
const float prev_co[3],
float *dist_px,
float r_loc[3],
float r_no[3])
{
return ED_transform_snap_object_project_view3d_ex(sctx,
depsgraph,
@ -3280,7 +3280,7 @@ bool ED_transform_snap_object_project_view3d(SnapObjectContext *sctx,
NULL,
NULL,
NULL,
NULL) != 0;
NULL);
}
/**