DNA: rename Object.size -> scale

Resolves a common cause of confusion.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 7834403b74b..79fbe4c4c62 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -225,7 +225,7 @@ static void smoke_set_domain_from_mesh(SmokeDomainSettings *sds, Object *ob, Mes
 	}
 	/* apply object scale */
 	for (i = 0; i < 3; i++) {
-		size[i] = fabsf(size[i] * ob->size[i]);
+		size[i] = fabsf(size[i] * ob->scale[i]);
 	}
 	copy_v3_v3(sds->global_size, size);
 	copy_v3_v3(sds->dp0, min);
@@ -239,21 +239,21 @@ static void smoke_set_domain_from_mesh(SmokeDomainSettings *sds, Object *ob, Mes
 	/* define grid resolutions from longest domain side */
 	if (size[0] >= MAX2(size[1], size[2])) {
 		scale = res / size[0];
-		sds->scale = size[0] / fabsf(ob->size[0]);
+		sds->scale = size[0] / fabsf(ob->scale[0]);
 		sds->base_res[0] = res;
 		sds->base_res[1] = max_ii((int)(size[1] * scale + 0.5f), 4);
 		sds->base_res[2] = max_ii((int)(size[2] * scale + 0.5f), 4);
 	}
 	else if (size[1] >= MAX2(size[0], size[2])) {
 		scale = res / size[1];
-		sds->scale = size[1] / fabsf(ob->size[1]);
+		sds->scale = size[1] / fabsf(ob->scale[1]);
 		sds->base_res[0] = max_ii((int)(size[0] * scale + 0.5f), 4);
 		sds->base_res[1] = res;
 		sds->base_res[2] = max_ii((int)(size[2] * scale + 0.5f), 4);
 	}
 	else {
 		scale = res / size[2];
-		sds->scale = size[2] / fabsf(ob->size[2]);
+		sds->scale = size[2] / fabsf(ob->scale[2]);
 		sds->base_res[0] = max_ii((int)(size[0] * scale + 0.5f), 4);
 		sds->base_res[1] = max_ii((int)(size[1] * scale + 0.5f), 4);
 		sds->base_res[2] = res;