diff options
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 16 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 7a5605e1542..f8bc9ca8512 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -847,7 +847,7 @@ class CYCLES_CAMERA_PT_dof_aperture(CyclesButtonsPanel, Panel): def draw(self, context): layout = self.layout layout.use_property_split = True - flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False) + flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False) cam = context.camera ccam = cam.cycles @@ -878,7 +878,7 @@ class CYCLES_CAMERA_PT_dof_viewport(CyclesButtonsPanel, Panel): def draw(self, context): layout = self.layout layout.use_property_split = True - flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False) + flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False) cam = context.camera dof_options = cam.gpu_dof @@ -1539,7 +1539,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel): def draw(self, context): layout = self.layout layout.use_property_split = True - layout.use_property_decorate = False # No animation.
+ layout.use_property_decorate = False # No animation. scene = context.scene cscene = scene.cycles @@ -1568,7 +1568,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel): if cscene.bake_type == 'NORMAL': col.prop(cbk, "normal_space", text="Space") - sub = col.column(align=True)
+ sub = col.column(align=True) sub.prop(cbk, "normal_r", text="Swizzle R") sub.prop(cbk, "normal_g", text="G") sub.prop(cbk, "normal_b", text="B") @@ -1590,7 +1590,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel): elif cscene.bake_type in {'DIFFUSE', 'GLOSSY', 'TRANSMISSION', 'SUBSURFACE'}: row = col.row(align=True) - row.use_property_split = False
+ row.use_property_split = False row.prop(cbk, "use_pass_direct", toggle=True) row.prop(cbk, "use_pass_indirect", toggle=True) row.prop(cbk, "use_pass_color", toggle=True) @@ -1609,12 +1609,12 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel): sub.prop(cbk, "use_cage", text="Cage") if cbk.use_cage: sub.prop(cbk, "cage_extrusion", text="Extrusion") - sub.prop_search(cbk, "cage_object", scene, "objects", text="Cage Object")
+ sub.prop_search(cbk, "cage_object", scene, "objects", text="Cage Object") else: sub.prop(cbk, "cage_extrusion", text="Ray Distance") - layout.separator()
-
+ layout.separator() + layout.operator("object.bake", icon='RENDER_STILL').type = cscene.bake_type diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index aea63b6b31f..c5df5842bad 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -457,6 +457,7 @@ static void blender_camera_sync(Camera *cam, cam->matrix = blender_camera_matrix(bcam->matrix, bcam->type, bcam->panorama_type); + cam->motion.clear(); cam->motion.resize(bcam->motion_steps, cam->matrix); cam->use_perspective_motion = false; cam->shuttertime = bcam->shuttertime; diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index e0737d5118a..6d6b367209d 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -448,6 +448,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph, mesh->motion_steps = motion_steps; } + object->motion.clear(); object->motion.resize(motion_steps, transform_empty()); if(motion_steps) { diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index e9ede91c295..4e754d22984 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -293,7 +293,7 @@ static inline int4 get_int4(const BL::Array<int, 4>& array) return make_int4(array[0], array[1], array[2], array[3]); } -static inline uint get_layer(const BL::Array<int, 20>& array) +static inline uint get_layer(const BL::Array<bool, 20>& array) { uint layer = 0; @@ -304,8 +304,8 @@ static inline uint get_layer(const BL::Array<int, 20>& array) return layer; } -static inline uint get_layer(const BL::Array<int, 20>& array, - const BL::Array<int, 8>& local_array, +static inline uint get_layer(const BL::Array<bool, 20>& array, + const BL::Array<bool, 8>& local_array, bool is_light = false, uint view_layers = (1 << 20) - 1) { |