Commit: 3fb0674a1a1aaf411f569710de2ac2375e8431b5
Author: Julian Eisel
Date: Thu Feb 23 15:38:52 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB3fb0674a1a1aaf411f569710de2ac2375e8431b5
Merge branch 'master' into HMD_viewport
Conflicts:
source/blender/makesdna/DNA_scene_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_scene_types.h
index 4a7bfd4839,918d0f0004..766ad882e3
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1712,10 -1712,11 +1712,11 @@@ typedef struct Scene
/* flag */
/* use preview range */
-#define SCER_PRV_RANGE (1<<0)
-#define SCER_LOCK_FRAME_SELECTION (1<<1)
+#define SCER_PRV_RANGE (1 << 0)
+#define SCER_LOCK_FRAME_SELECTION (1 << 1)
/* timeline/keyframe jumping - only selected items (on by default) */
-#define SCE_KEYS_NO_SELONLY (1<<2)
-#define SCER_SHOW_SUBFRAME (1<<3)
+#define SCE_KEYS_NO_SELONLY (1 << 2)
++#define SCER_SHOW_SUBFRAME (1 << 3)
/* mode (int now) */
#define R_OSA 0x0001
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
