lib+blender: Fix status info display in interactive mode

Few things were broken with the recent shuffle from ctypes to defining
the type in CPython code.

bindings/blender_init.py

@@ -186,10 +186,10 @@ def draw_direct(bitmap):
 def status_update_interactive(cb_info, args):
 	tag_redraw, update_stats, self = args
 	tag_redraw()
-	if info.finished_passes == self.cr_renderer.prefs.samples:
+	if cb_info.finished_passes == self.cr_renderer.prefs.samples:
 		update_stats("Rendering done", "")
 	else:
-		update_stats("Sample {}".format(info.finished_passes), "")
+		update_stats("Sample {}".format(cb_info.finished_passes), "")
 
 class CrayRender(bpy.types.RenderEngine):
 	bl_idname = "C_RAY"

bindings/cray_wrap.c

@@ -81,6 +81,7 @@ static PyMemberDef CallbackInfo_members[] = {
 	{ "avg_per_ray", T_DOUBLE, offsetof(CallbackInfoObject, info.avg_per_ray_us), 0, "Microseconds per ray, on average" },
 	{ "samples_per_sec", T_LONG, offsetof(CallbackInfoObject, info.samples_per_sec), 0, "Samples per second" },
 	{ "eta_ms", T_LONG, offsetof(CallbackInfoObject, info.eta_ms), 0, "ETA to render finished, in milliseconds" },
+	{ "finished_passes", T_ULONG, offsetof(CallbackInfoObject, info.finished_passes), 0, "Passes finished in interactive mode" },
 	{ "completion", T_DOUBLE, offsetof(CallbackInfoObject, info.completion), 0, "Render completion" },
 	{ "paused", T_INT, offsetof(CallbackInfoObject, info.paused), 0, "Boolean, render paused" },
 	{ NULL },

src/lib/datatypes/tile.c

@@ -51,6 +51,8 @@ struct render_tile *tile_next_interactive(struct renderer *r, struct tile_set *s
 			tile->index = set->finished++;
 		} else {
 			r->state.finishedPasses++;
+			// FIXME: It's pretty confusing that we're firing this callback here instead of in the
+			// renderer main loop directly.
 			struct cr_renderer_cb_info cb_info = { 0 };
 			cb_info.finished_passes = r->state.finishedPasses - 1;
 			struct callback cb = r->state.callbacks[cr_cb_on_interactive_pass_finished];