Merge branch 'master' into blender2.8

4 files changed, 8 insertions, 9 deletions

diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index f7ede251873..eebe69b7a19 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -202,7 +202,7 @@ void ED_render_engine_changed(Main *bmain)
 	update_ctx.bmain = bmain;
 	for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 		update_ctx.scene = scene;
-		LINKLIST_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
+		BLI_LISTBASE_FOREACH(ViewLayer *, view_layer, &scene->view_layers) {
 			/* TDODO(sergey): Iterate over depsgraphs instead? */
 			update_ctx.depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
 			update_ctx.view_layer = view_layer;
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 3726d0f6294..1ffe62fbc00 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -483,7 +483,7 @@ static int collection_objects_add_exec(bContext *C, wmOperator *op)
 
 	CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects)
 	{
-		LINKLIST_FOREACH(LinkData *, link, &data.scene_collections_array) {
+		BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) {
 			SceneCollection *scene_collection = link->data;
 			BKE_collection_object_add(
 			            &scene->id,
@@ -538,7 +538,7 @@ static int collection_objects_remove_exec(bContext *C, wmOperator *op)
 
 	CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects)
 	{
-		LINKLIST_FOREACH(LinkData *, link, &data.scene_collections_array) {
+		BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) {
 			SceneCollection *scene_collection = link->data;
 			BKE_collection_object_remove(
 			            bmain,
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 3fd044afe48..c8f38e5282b 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -449,7 +449,7 @@ static void outliner_object_reorder(
 	TREESTORE(insert_element)->flag |= TSE_SELECTED;
 
 	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_selected_objects, &data);
-	LINKLIST_FOREACH(LinkData *, link, &data.objects_selected_array) {
+	BLI_LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) {
 		TreeElement *ten_selected = (TreeElement *)link->data;
 		/* Find parent scene-collection of object. */
 		if (ten_selected->parent) {
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index b78657ff11f..9f7b438e338 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1969,7 +1969,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 	}
 
 	// If modal, save settings back in scene if not set as operator argument
-	if (t->flag & T_MODAL) {
+	if ((t->flag & T_MODAL) || (op->flag & OP_IS_REPEAT)) {
 		/* save settings if not set in operator */
 
 		/* skip saving proportional edit if it was not actually used */
@@ -1989,10 +1989,9 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 					ts->proportional_objects = (proportional != PROP_EDIT_OFF);
 			}
 
-			if ((prop = RNA_struct_find_property(op->ptr, "proportional_size")) &&
-			    !RNA_property_is_set(op->ptr, prop))
-			{
-				ts->proportional_size = t->prop_size;
+			if ((prop = RNA_struct_find_property(op->ptr, "proportional_size"))) {
+				ts->proportional_size =
+				        RNA_property_is_set(op->ptr, prop) ? RNA_property_float_get(op->ptr, prop) : t->prop_size;
 			}
 
 			if ((prop = RNA_struct_find_property(op->ptr, "proportional_edit_falloff")) &&