[Bf-blender-cvs] [07adc11] soc-2013-depsgraph_mt: Code cleanup to address Lukas codereview comments

Sergey Sharybin noreply at git.blender.org
Wed Dec 11 17:47:44 CET 2013


Commit: 07adc115888affb0030e12593dd4909c2182b9b4
Author: Sergey Sharybin
Date:   Wed Dec 11 22:47:17 2013 +0600
http://developer.blender.org/rB07adc115888affb0030e12593dd4909c2182b9b4

Code cleanup to address Lukas codereview comments

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

M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 9c3f2d6..bd400f7 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1510,6 +1510,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho
 	SeqRenderData render_context;
 	Sequence *seq = context->seq;
 	Scene *scene = context->scene;
+	Main *bmain = context->bmain;
 	int cfra;
 
 	if (seq->type == SEQ_TYPE_MOVIE) {
@@ -1531,7 +1532,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho
 
 	/* fail safe code */
 
-	render_context = BKE_sequencer_new_render_data(G.main->evaluation_context, context->bmain, context->scene,
+	render_context = BKE_sequencer_new_render_data(bmain->evaluation_context, bmain, context->scene,
 	                                    (scene->r.size * (float) scene->r.xsch) / 100.0f + 0.5f,
 	                                    (scene->r.size * (float) scene->r.ysch) / 100.0f + 0.5f, 100);
 
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 6c95ae7..14084d8 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -370,7 +370,7 @@ void wm_event_do_notifiers(bContext *C)
 			/* XXX, hack so operators can enforce datamasks [#26482], gl render */
 			win->screen->scene->customdata_mask |= win->screen->scene->customdata_mask_modal;
 
-			BKE_scene_update_tagged(G.main->evaluation_context, bmain, win->screen->scene);
+			BKE_scene_update_tagged(bmain->evaluation_context, bmain, win->screen->scene);
 		}
 	}




More information about the Bf-blender-cvs mailing list