diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
| commit | e76ff4df4123b5517599930629dbcf0507b582e9 (patch) | |
| tree | 3cf9a67f3a3a05c678f39a04533da81f56e66c02 /intern/cycles/blender/addon/__init__.py | |
| parent | 15dd6cb66887eb83fcc3ecf44c3b42a53161e390 (diff) | |
| parent | 528f0b95c4462b2e429600a566ca0434c90310f6 (diff) | |
Merge branch 'master' into tmp-widget-optitmp-widget-opti
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
Diffstat (limited to 'intern/cycles/blender/addon/__init__.py')
| -rw-r--r-- | intern/cycles/blender/addon/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 3d2a52d0cf6..3ab352e52a2 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -82,8 +82,8 @@ class CyclesRender(bpy.types.RenderEngine): def render(self, depsgraph): engine.render(self, depsgraph) - def bake(self, depsgraph, obj, pass_type, pass_filter, object_id, pixel_array, num_pixels, depth, result): - engine.bake(self, depsgraph, obj, pass_type, pass_filter, object_id, pixel_array, num_pixels, depth, result) + def bake(self, depsgraph, obj, pass_type, pass_filter, width, height): + engine.bake(self, depsgraph, obj, pass_type, pass_filter, width, height) # viewport render def view_update(self, context, depsgraph): |