forked from bartvdbraak/blender
cleanup
This commit is contained in:
parent
e408e632a1
commit
7221fbe9dd
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
#define __KERNEL_CPU__
|
#define __KERNEL_CPU__
|
||||||
|
|
||||||
/* Release kernel has too much false-positive maybe-uninitialzied warnings,
|
/* Release kernel has too much false-positive maybe-uninitialized warnings,
|
||||||
* which makes it possible to miss actual warnings.
|
* which makes it possible to miss actual warnings.
|
||||||
*/
|
*/
|
||||||
#if defined(__GNUC__) && defined(NDEBUG)
|
#if defined(__GNUC__) && defined(NDEBUG)
|
||||||
|
@ -2042,7 +2042,8 @@ static void SCREEN_OT_region_scale(wmOperatorType *ot)
|
|||||||
|
|
||||||
/* ************** frame change operator ***************************** */
|
/* ************** frame change operator ***************************** */
|
||||||
|
|
||||||
static void areas_do_frame_follow (bContext *C, bool middle) {
|
static void areas_do_frame_follow(bContext *C, bool middle)
|
||||||
|
{
|
||||||
bScreen *scr = CTX_wm_screen(C);
|
bScreen *scr = CTX_wm_screen(C);
|
||||||
Scene *scene = CTX_data_scene(C);
|
Scene *scene = CTX_data_scene(C);
|
||||||
wmWindowManager *wm = CTX_wm_manager(C);
|
wmWindowManager *wm = CTX_wm_manager(C);
|
||||||
@ -2055,15 +2056,15 @@ static void areas_do_frame_follow (bContext *C, bool middle) {
|
|||||||
/* do follow here if editor type supports it */
|
/* do follow here if editor type supports it */
|
||||||
if ((scr->redraws_flag & TIME_FOLLOW)) {
|
if ((scr->redraws_flag & TIME_FOLLOW)) {
|
||||||
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
||||||
ELEM (sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
|
ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
|
||||||
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
||||||
{
|
{
|
||||||
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
||||||
|
|
||||||
if (middle) {
|
if (middle) {
|
||||||
if (scene->r.cfra < ar->v2d.cur.xmin || scene->r.cfra > ar->v2d.cur.xmax) {
|
if ((scene->r.cfra < ar->v2d.cur.xmin) || (scene->r.cfra > ar->v2d.cur.xmax)) {
|
||||||
ar->v2d.cur.xmax = scene->r.cfra + w/2;
|
ar->v2d.cur.xmax = scene->r.cfra + (w / 2);
|
||||||
ar->v2d.cur.xmin = scene->r.cfra - w/2;
|
ar->v2d.cur.xmin = scene->r.cfra - (w / 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -3531,7 +3532,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
|
|||||||
/* do follow here if editor type supports it */
|
/* do follow here if editor type supports it */
|
||||||
if ((sad->redraws & TIME_FOLLOW)) {
|
if ((sad->redraws & TIME_FOLLOW)) {
|
||||||
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
if ((ar->regiontype == RGN_TYPE_WINDOW &&
|
||||||
ELEM (sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
|
ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
|
||||||
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
(sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW))
|
||||||
{
|
{
|
||||||
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
float w = BLI_rctf_size_x(&ar->v2d.cur);
|
||||||
|
Loading…
Reference in New Issue
Block a user