Merge branch 'master' into blender2.8

2018-11-30 17:07:59 +11:00
parent 0f17425d6e 6e253fc627
commit cb8afaf5db
1 changed files with 1 additions and 1 deletions
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -780,7 +780,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
 						}
 					}
 				}
-			} RNA_END
+			} RNA_END;

 			if(used_devices.size() == 1) {
 				params.device = used_devices[0];