Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/animation/anim_draw.c

3 files changed, 31 insertions, 31 deletions

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index a6e0ca31cf7..e631a4a365d 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1510,8 +1510,8 @@ static void pbvh_bmesh_node_limit_ensure_fast(PBVH *bvh, BMFace **nodeinfo, BBC
 		num_child2--;
 	}
 
-	/* at this point, faces should have been split along the array range sequencially, each sequencial
-	 * part belonging to one node only */
+	/* at this point, faces should have been split along the array range sequentially,
+	 * each sequential part belonging to one node only */
 	BLI_assert((num_child1 + num_child2) == node->totface);
 
 	node->child1 = child1 = BLI_memarena_alloc(arena, sizeof(FastNodeBuildInfo));
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index d5454bac535..81cc55f754d 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -139,8 +139,8 @@ static void sound_sync_callback(void *data, int mode, float time)
 				BKE_sound_play_scene(scene);
 			else
 				BKE_sound_stop_scene(scene);
-			if (scene->sound_scene_handle)
-				AUD_seek(scene->sound_scene_handle, time);
+			if (scene->playback_handle)
+				AUD_seek(scene->playback_handle, time);
 		}
 		scene = scene->id.next;
 	}
@@ -383,15 +383,15 @@ void BKE_sound_create_scene(struct Scene *scene)
 	scene->sound_scene = AUD_createSequencer(FPS, scene->audio.flag & AUDIO_MUTE);
 	AUD_updateSequencerData(scene->sound_scene, scene->audio.speed_of_sound,
 	                        scene->audio.doppler_factor, scene->audio.distance_model);
-	scene->sound_scene_handle = NULL;
+	scene->playback_handle = NULL;
 	scene->sound_scrub_handle = NULL;
 	scene->speaker_handles = NULL;
 }
 
 void BKE_sound_destroy_scene(struct Scene *scene)
 {
-	if (scene->sound_scene_handle)
-		AUD_stop(scene->sound_scene_handle);
+	if (scene->playback_handle)
+		AUD_stop(scene->playback_handle);
 	if (scene->sound_scrub_handle)
 		AUD_stop(scene->sound_scrub_handle);
 	if (scene->sound_scene)
@@ -524,13 +524,13 @@ void BKE_sound_update_sequencer(struct Main *main, bSound *sound)
 
 static void sound_start_play_scene(struct Scene *scene)
 {
-	if (scene->sound_scene_handle)
-		AUD_stop(scene->sound_scene_handle);
+	if (scene->playback_handle)
+		AUD_stop(scene->playback_handle);
 
 	AUD_setSequencerDeviceSpecs(scene->sound_scene);
 
-	if ((scene->sound_scene_handle = AUD_play(scene->sound_scene, 1)))
-		AUD_setLoop(scene->sound_scene_handle, -1);
+	if ((scene->playback_handle = AUD_play(scene->sound_scene, 1)))
+		AUD_setLoop(scene->playback_handle, -1);
 }
 
 void BKE_sound_play_scene(struct Scene *scene)
@@ -540,20 +540,20 @@ void BKE_sound_play_scene(struct Scene *scene)
 
 	AUD_lock();
 
-	status = scene->sound_scene_handle ? AUD_getStatus(scene->sound_scene_handle) : AUD_STATUS_INVALID;
+	status = scene->playback_handle ? AUD_getStatus(scene->playback_handle) : AUD_STATUS_INVALID;
 
 	if (status == AUD_STATUS_INVALID) {
 		sound_start_play_scene(scene);
 
-		if (!scene->sound_scene_handle) {
+		if (!scene->playback_handle) {
 			AUD_unlock();
 			return;
 		}
 	}
 
 	if (status != AUD_STATUS_PLAYING) {
-		AUD_seek(scene->sound_scene_handle, cur_time);
-		AUD_resume(scene->sound_scene_handle);
+		AUD_seek(scene->playback_handle, cur_time);
+		AUD_resume(scene->playback_handle);
 	}
 
 	if (scene->audio.flag & AUDIO_SYNC)
@@ -564,8 +564,8 @@ void BKE_sound_play_scene(struct Scene *scene)
 
 void BKE_sound_stop_scene(struct Scene *scene)
 {
-	if (scene->sound_scene_handle) {
-		AUD_pause(scene->sound_scene_handle);
+	if (scene->playback_handle) {
+		AUD_pause(scene->playback_handle);
 
 		if (scene->audio.flag & AUDIO_SYNC)
 			AUD_stopPlayback();
@@ -583,17 +583,17 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
 
 	AUD_lock();
 
-	status = scene->sound_scene_handle ? AUD_getStatus(scene->sound_scene_handle) : AUD_STATUS_INVALID;
+	status = scene->playback_handle ? AUD_getStatus(scene->playback_handle) : AUD_STATUS_INVALID;
 
 	if (status == AUD_STATUS_INVALID) {
 		sound_start_play_scene(scene);
 
-		if (!scene->sound_scene_handle) {
+		if (!scene->playback_handle) {
 			AUD_unlock();
 			return;
 		}
 
-		AUD_pause(scene->sound_scene_handle);
+		AUD_pause(scene->playback_handle);
 	}
 
 	animation_playing = 0;
@@ -606,13 +606,13 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
 
 	if ((scene->audio.flag & AUDIO_SCRUB) && !animation_playing) {
 		if (scene->audio.flag & AUDIO_SYNC) {
-			AUD_seek(scene->sound_scene_handle, cur_time);
-			AUD_seekSequencer(scene->sound_scene_handle, cur_time);
+			AUD_seek(scene->playback_handle, cur_time);
+			AUD_seekSequencer(scene->playback_handle, cur_time);
 		}
 		else {
-			AUD_seek(scene->sound_scene_handle, cur_time);
+			AUD_seek(scene->playback_handle, cur_time);
 		}
-		AUD_resume(scene->sound_scene_handle);
+		AUD_resume(scene->playback_handle);
 		if (scene->sound_scrub_handle && AUD_getStatus(scene->sound_scrub_handle) != AUD_STATUS_INVALID) {
 			AUD_seek(scene->sound_scrub_handle, 0);
 		}
@@ -620,16 +620,16 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
 			if (scene->sound_scrub_handle) {
 				AUD_stop(scene->sound_scrub_handle);
 			}
-			scene->sound_scrub_handle = AUD_pauseAfter(scene->sound_scene_handle, one_frame);
+			scene->sound_scrub_handle = AUD_pauseAfter(scene->playback_handle, one_frame);
 		}
 	}
 	else {
 		if (scene->audio.flag & AUDIO_SYNC) {
-			AUD_seekSequencer(scene->sound_scene_handle, cur_time);
+			AUD_seekSequencer(scene->playback_handle, cur_time);
 		}
 		else {
 			if (status == AUD_STATUS_PLAYING) {
-				AUD_seek(scene->sound_scene_handle, cur_time);
+				AUD_seek(scene->playback_handle, cur_time);
 			}
 		}
 	}
@@ -639,11 +639,11 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
 
 float BKE_sound_sync_scene(struct Scene *scene)
 {
-	if (scene->sound_scene_handle) {
+	if (scene->playback_handle) {
 		if (scene->audio.flag & AUDIO_SYNC)
-			return AUD_getSequencerPosition(scene->sound_scene_handle);
+			return AUD_getSequencerPosition(scene->playback_handle);
 		else
-			return AUD_getPosition(scene->sound_scene_handle);
+			return AUD_getPosition(scene->playback_handle);
 	}
 	return NAN_FLT;
 }
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 0cfb76325fb..3a4b95d8f18 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -301,7 +301,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm,
 	float uv[3] = {0.0f, 0.0f, 0.0f}; /* only first 2 values are written into */
 
 	limit[0] = limit[1] = STD_UV_CONNECT_LIMIT;
-	/* previous behaviour here is without accounting for winding, however this causes stretching in
+	/* previous behavior here is without accounting for winding, however this causes stretching in
 	 * UV map in really simple cases with mirror + subsurf, see second part of T44530. Also, initially
 	 * intention is to treat merged vertices from mirror modifier as seams, see code below with ME_VERT_MERGED
 	 * This fixes a very old regression (2.49 was correct here) */