Cycles: more code refactoring to rename things internally as well. Also change

property name back so we keep compatibility.

intern/cycles/device/device_task.h

@@ -63,7 +63,7 @@ public:
 	boost::function<bool(void)> get_cancel;
 
 	bool need_finish_queue;
-	bool integrator_progressive;
+	bool integrator_branched;
 protected:
 	double last_update_time;
 };