[Bf-blender-cvs] [03e14bfeb66] blender2.8: Versioning: default scene to mean center pivot

Campbell Barton noreply at git.blender.org
Sun May 13 07:30:20 CEST 2018


Commit: 03e14bfeb663023dce86aa6887b919704318e80b
Author: Campbell Barton
Date:   Sun May 13 07:25:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB03e14bfeb663023dce86aa6887b919704318e80b

Versioning: default scene to mean center pivot

===================================================================

M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/intern/versioning_280.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7875a4e2076..f95da4f723f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -823,8 +823,7 @@ void BKE_scene_init(Scene *sce)
 	BKE_view_layer_add(sce, "View Layer");
 
 	/* SceneDisplay */
-	static float default_light_direction[] = {-0.577350269, -0.577350269, 0.577350269};
-	copy_v3_v3(sce->display.light_direction, default_light_direction);
+	copy_v3_v3(sce->display.light_direction, (float[3]){-M_SQRT1_3, -M_SQRT1_3, M_SQRT1_3});
 }
 
 Scene *BKE_scene_add(Main *bmain, const char *name)
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index a4c14d31b2c..08cb81bb357 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1082,8 +1082,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "SceneDisplay", "display")) {
 			/* Initialize new scene.SceneDisplay */
 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
-				static float default_light_direction[] = {-0.577350269, -0.577350269, 0.577350269};
-				copy_v3_v3(scene->display.light_direction, default_light_direction);
+				copy_v3_v3(scene->display.light_direction, (float[3]){-M_SQRT1_3, -M_SQRT1_3, M_SQRT1_3});
 			}
 		}
 
@@ -1093,5 +1092,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 				ob->display.flag = OB_SHOW_SHADOW;
 			}
 		}
+
+		if (!DNA_struct_elem_find(fd->filesdna, "ToolSettings", "char", "transform_pivot_point")) {
+			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+				scene->toolsettings->transform_pivot_point = V3D_AROUND_CENTER_MEAN;
+			}
+		}
 	}
 }



More information about the Bf-blender-cvs mailing list