Commit: 7221fbe9ddd4ae446057866079df750368f14681
Author: Campbell Barton
Date: Thu Feb 12 23:51:02 2015 +1100
Branches: master
https://developer.blender.org/rB7221fbe9ddd4ae446057866079df750368f14681
cleanup
===================================================================
M intern/cycles/kernel/kernel_compat_cpu.h
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h
b/intern/cycles/kernel/kernel_compat_cpu.h
index d500cba..200667a 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -19,7 +19,7 @@
#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.
*/
#if defined(__GNUC__) && defined(NDEBUG)
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 6db6d8d..99ce1a0 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2042,7 +2042,8 @@ static void SCREEN_OT_region_scale(wmOperatorType *ot)
/* ************** 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);
Scene *scene = CTX_data_scene(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 */
if ((scr->redraws_flag & TIME_FOLLOW)) {
if ((ar->regiontype == RGN_TYPE_WINDOW
&&
- ELEM (sa->spacetype, SPACE_SEQ,
SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
- (sa->spacetype == SPACE_CLIP &&
ar->regiontype == RGN_TYPE_PREVIEW))
+ ELEM(sa->spacetype, SPACE_SEQ,
SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) ||
+ (sa->spacetype == SPACE_CLIP &&
ar->regiontype == RGN_TYPE_PREVIEW))
{
float w =
BLI_rctf_size_x(&ar->v2d.cur);
if (middle) {
- 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.xmin = scene->r.cfra - w/2;
+ 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.xmin = scene->r.cfra - (w / 2);
}
}
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 */
if ((sad->redraws &
TIME_FOLLOW)) {
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))
{
float w =
BLI_rctf_size_x(&ar->v2d.cur);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
