[Bf-blender-cvs] [53c6d3399a0] blender2.8: Remove G.main usage

Joshua Leung noreply at git.blender.org
Tue May 15 18:39:30 CEST 2018


Commit: 53c6d3399a053e912ade6c73c9cbbd0b37d515b7
Author: Joshua Leung
Date:   Tue May 15 18:31:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB53c6d3399a053e912ade6c73c9cbbd0b37d515b7

Remove G.main usage

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

M	source/blender/editors/armature/pose_transform.c

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

diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index deed786944b..e4ffa614420 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -75,10 +75,11 @@
 static void applyarmature_fix_boneparents(const bContext *C, Scene *scene, Object *armob)
 {
 	Depsgraph *depsgraph = CTX_data_depsgraph(C);
+	Main *bmain = CTX_data_main(C);
 	Object workob, *ob;
 	
 	/* go through all objects in database */
-	for (ob = G.main->object.first; ob; ob = ob->id.next) {
+	for (ob = bmain->object.first; ob; ob = ob->id.next) {
 		/* if parent is bone in this armature, apply corrections */
 		if ((ob->parent == armob) && (ob->partype == PARBONE)) {
 			/* apply current transform from parent (not yet destroyed),



More information about the Bf-blender-cvs mailing list