[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49576] trunk/blender/source/blender: code cleanup: remove redundant calls to CTX_data_main()

Campbell Barton ideasman42 at gmail.com
Sun Aug 5 16:11:52 CEST 2012


Revision: 49576
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49576
Author:   campbellbarton
Date:     2012-08-05 14:11:51 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
code cleanup: remove redundant calls to CTX_data_main()

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenlib/intern/math_geom.c
    trunk/blender/source/blender/editors/sound/sound_ops.c
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-05 13:26:39 UTC (rev 49575)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-05 14:11:51 UTC (rev 49576)
@@ -3918,7 +3918,7 @@
 
 	AUD_SoundInfo info;
 
-	sound = sound_new_file(CTX_data_main(C), seq_load->path); /* handles relative paths */
+	sound = sound_new_file(bmain, seq_load->path); /* handles relative paths */
 
 	if (sound == NULL || sound->playback_handle == NULL) {
 		//if (op)

Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c	2012-08-05 13:26:39 UTC (rev 49575)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c	2012-08-05 14:11:51 UTC (rev 49576)
@@ -430,7 +430,7 @@
 {
 #define CCW(A, B, C) ((C[1] - A[1]) * (B[0] - A[0]) > (B[1]-A[1]) * (C[0]-A[0]))
 
-   return CCW(v1, v3, v4) != CCW(v2, v3, v4) && CCW(v1, v2, v3) != CCW(v1, v2, v4);
+	return CCW(v1, v3, v4) != CCW(v2, v3, v4) && CCW(v1, v2, v3) != CCW(v1, v2, v4);
 
 #undef CCW
 }

Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c	2012-08-05 13:26:39 UTC (rev 49575)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c	2012-08-05 14:11:51 UTC (rev 49576)
@@ -701,7 +701,7 @@
 		return OPERATOR_CANCELLED;
 
 	sound->packedfile = newPackedFile(op->reports, sound->name, ID_BLEND_PATH(bmain, &sound->id));
-	sound_load(CTX_data_main(C), sound);
+	sound_load(bmain, sound);
 
 	return OPERATOR_FINISHED;
 }
@@ -725,6 +725,7 @@
 
 static int sound_unpack_exec(bContext *C, wmOperator *op)
 {
+	Main *bmain = CTX_data_main(C);
 	int method = RNA_enum_get(op->ptr, "method");
 	bSound *sound = NULL;
 
@@ -732,7 +733,7 @@
 	if (RNA_struct_property_is_set(op->ptr, "id")) {
 		char sndname[MAX_ID_NAME - 2];
 		RNA_string_get(op->ptr, "id", sndname);
-		sound = BLI_findstring(&CTX_data_main(C)->sound, sndname, offsetof(ID, name) + 2);
+		sound = BLI_findstring(&bmain->sound, sndname, offsetof(ID, name) + 2);
 	}
 
 	if (!sound || !sound->packedfile)
@@ -741,7 +742,7 @@
 	if (G.fileflags & G_AUTOPACK)
 		BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save");
 
-	unpackSound(CTX_data_main(C), op->reports, sound, method);
+	unpackSound(bmain, op->reports, sound, method);
 
 	return OPERATOR_FINISHED;
 }

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2012-08-05 13:26:39 UTC (rev 49575)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2012-08-05 14:11:51 UTC (rev 49576)
@@ -639,7 +639,7 @@
 
 	bpy_context_set(C, &gilstate);
 
-	for (text = CTX_data_main(C)->text.first; text; text = text->id.next) {
+	for (text = bmain->text.first; text; text = text->id.next) {
 		if (text->flags & TXT_ISSCRIPT && BLI_testextensie(text->id.name + 2, ".py")) {
 			if (!(G.f & G_SCRIPT_AUTOEXEC)) {
 				printf("scripts disabled for \"%s\", skipping '%s'\n", bmain->name, text->id.name + 2);




More information about the Bf-blender-cvs mailing list