diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 15 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 16 |
3 files changed, 17 insertions, 18 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 11657003259..2945cdb4593 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1462,6 +1462,7 @@ typedef struct KernelSpotLight { float spot_angle; float spot_smooth; float dir[3]; + float pad; } KernelSpotLight; /* PointLight is SpotLight with only radius and invarea being used. */ @@ -1470,13 +1471,16 @@ typedef struct KernelAreaLight { float axisu[3]; float invarea; float axisv[3]; + float pad1; float dir[3]; + float pad2; } KernelAreaLight; typedef struct KernelDistantLight { float radius; float cosangle; float invarea; + float pad; } KernelDistantLight; typedef struct KernelLight { diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 467512a9746..f13c1fb3130 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -301,20 +301,21 @@ class CLIP_OT_bundles_to_mesh(Operator): reconstructed_matrix = reconstruction.cameras.matrix_from_frame(framenr) matrix = camera.matrix_world * reconstructed_matrix.inverted() - mesh = bpy.data.meshes.new(name="Tracks") for track in tracking_object.tracks: if track.has_bundle and track.select == True: new_verts.append(track.bundle) if new_verts: + mesh = bpy.data.meshes.new(name="Tracks") mesh.vertices.add(len(new_verts)) mesh.vertices.foreach_set("co", unpack_list(new_verts)) - - ob = bpy.data.objects.new(name="Tracks", object_data=mesh) - - ob.matrix_world = matrix - - context.scene.objects.link(ob) + ob = bpy.data.objects.new(name="Tracks", object_data=mesh) + ob.matrix_world = matrix + context.scene.objects.link(ob) + ob.select = True + context.scene.objects.active = ob + else: + self.report({'WARNING'}, "No usable tracks selected") return {'FINISHED'} diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 80daa306bff..b7d07d5c7ef 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -499,6 +499,11 @@ void DepsgraphNodeBuilder::build_object(Base *base, * on object's level animation, for example in case of rebuilding * pose for proxy. */ + OperationDepsNode *op_node = add_operation_node(&object->id, + DEG_NODE_TYPE_PARAMETERS, + NULL, + DEG_OPCODE_PARAMETERS_EVAL); + op_node->set_as_exit(); build_animdata(&object->id); /* Particle systems. */ if (object->particlesystem.first != NULL) { @@ -985,17 +990,6 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object) Scene *scene_cow = get_cow_datablock(scene_); Object *object_cow = get_cow_datablock(object); - /* TODO(sergey): This way using this object's properties as driver target - * works fine. - * - * Does this depend on other nodes? - */ - op_node = add_operation_node(&object->id, - DEG_NODE_TYPE_PARAMETERS, - NULL, - DEG_OPCODE_PARAMETERS_EVAL); - op_node->set_as_exit(); - /* Temporary uber-update node, which does everything. * It is for the being we're porting old dependencies into the new system. * We'll get rid of this node as soon as all the granular update functions |