diff options
41 files changed, 193 insertions, 189 deletions
diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index bc1a0b82d85..a69addf72f5 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -2041,7 +2041,7 @@ def write(filename, batch_objects = None, \ # ob_base.makeDisplayList() # This causes the makeDisplayList command to effect the mesh - scene.set_frame(scene.current_frame) + scene.set_frame(scene.frame_current) # Blender.Set('curframe', Blender.Get('curframe')) @@ -2216,7 +2216,7 @@ def write(filename, batch_objects = None, \ ob_base.make_display_list() # ob_base.makeDisplayList() # This causes the makeDisplayList command to effect the mesh - scene.set_frame(scene.current_frame) + scene.set_frame(scene.frame_current) # Blender.Set('curframe', Blender.Get('curframe')) del tmp_ob_type, tmp_objects @@ -2701,9 +2701,9 @@ Connections: {''') return int(0.5 + ((t/fps) * 46186158000)) fps = float(render.fps) - start = scene.start_frame + start = scene.frame_start # start = render.sFrame - end = scene.end_frame + end = scene.frame_end # end = render.eFrame if end < start: start, end = end, start if start==end: ANIM_ENABLE = False @@ -2713,7 +2713,7 @@ Connections: {''') if ANIM_ENABLE and [tmp for tmp in ob_anim_lists if tmp]: - frame_orig = scene.current_frame + frame_orig = scene.frame_current # frame_orig = Blender.Get('curframe') if ANIM_OPTIMIZE: diff --git a/release/scripts/io/export_mdd.py b/release/scripts/io/export_mdd.py index cf72169121c..be3ddbc73bd 100644 --- a/release/scripts/io/export_mdd.py +++ b/release/scripts/io/export_mdd.py @@ -82,7 +82,7 @@ def write(filename, sce, ob, PREF_STARTFRAME, PREF_ENDFRAME, PREF_FPS): bpy.ops.object.mode_set(mode='OBJECT') - orig_frame = sce.current_frame + orig_frame = sce.frame_current sce.set_frame(PREF_STARTFRAME) me = ob.create_mesh(True, 'PREVIEW') @@ -162,8 +162,8 @@ class ExportMDD(bpy.types.Operator): path = StringProperty(name="File Path", description="File path used for exporting the MDD file", maxlen=1024) check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'}) fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25) - start_frame = IntProperty(name="Start Frame", description="Start frame for baking", min=minframe, max=maxframe, default=1) - end_frame = IntProperty(name="End Frame", description="End frame for baking", min=minframe, max=maxframe, default=250) + frame_start = IntProperty(name="Start Frame", description="Start frame for baking", min=minframe, max=maxframe, default=1) + frame_end = IntProperty(name="End Frame", description="End frame for baking", min=minframe, max=maxframe, default=250) def poll(self, context): ob = context.active_object @@ -173,7 +173,7 @@ class ExportMDD(bpy.types.Operator): if not self.properties.path: raise Exception("filename not set") write(self.properties.path, context.scene, context.active_object, - self.properties.start_frame, self.properties.end_frame, self.properties.fps) + self.properties.frame_start, self.properties.frame_end, self.properties.fps) return {'FINISHED'} def invoke(self, context, event): diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 1f3b8c7db47..6ea00a74435 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -839,14 +839,14 @@ def do_export(filename, context, for scn in export_scenes: # scn.makeCurrent() # If already current, this is not slow. # context = scn.getRenderingContext() - orig_frame = scn.current_frame + orig_frame = scn.frame_current if EXPORT_ALL_SCENES: # Add scene name into the context_name context_name[1] = '_%s' % bpy.utils.clean_name(scn.name) # WARNING, its possible that this could cause a collision. we could fix if were feeling parranoied. # Export an animation? if EXPORT_ANIMATION: - scene_frames = range(scn.start_frame, context.end_frame+1) # Up to and including the end frame. + scene_frames = range(scn.frame_start, context.frame_end + 1) # Up to and including the end frame. else: scene_frames = [orig_frame] # Dont export an animation. @@ -855,7 +855,7 @@ def do_export(filename, context, if EXPORT_ANIMATION: # Add frame to the filename. context_name[2] = '_%.6d' % frame - scn.current_frame = frame + scn.frame_current = frame if EXPORT_SEL_ONLY: export_objects = context.selected_objects else: @@ -874,7 +874,7 @@ def do_export(filename, context, EXPORT_POLYGROUPS, EXPORT_CURVE_AS_NURBS) - scn.current_frame = orig_frame + scn.frame_current = orig_frame # Restore old active scene. # orig_scene.makeCurrent() diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index 044daf39a47..e6142a2db8a 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -321,11 +321,11 @@ def bvh_node_dict2objects(context, bvh_nodes, IMPORT_START_FRAME=1, IMPORT_LOOP= # Animate the data, the last used bvh_node will do since they all have the same number of frames - for current_frame in range(len(bvh_node.anim_data)): - Blender.Set('curframe', current_frame + IMPORT_START_FRAME) + for frame_current in range(len(bvh_node.anim_data)): + Blender.Set('curframe', frame_current + IMPORT_START_FRAME) for bvh_node in bvh_nodes.values(): - lx, ly, lz, rx, ry, rz = bvh_node.anim_data[current_frame] + lx, ly, lz, rx, ry, rz = bvh_node.anim_data[frame_current] rest_head_local = bvh_node.rest_head_local bvh_node.temp.loc = rest_head_local + Vector(lx, ly, lz) @@ -508,16 +508,16 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM prev_euler = [Euler() for i in range(len(bvh_nodes))] # Animate the data, the last used bvh_node will do since they all have the same number of frames - for current_frame in range(len(bvh_node.anim_data)-1): # skip the first frame (rest frame) - # print current_frame + for frame_current in range(len(bvh_node.anim_data)-1): # skip the first frame (rest frame) + # print frame_current - # if current_frame==40: # debugging + # if frame_current==40: # debugging # break # Dont neet to set the current frame for i, bvh_node in enumerate(bvh_nodes.values()): pose_bone, bone, bone_rest_matrix, bone_rest_matrix_inv = bvh_node.temp - lx, ly, lz, rx, ry, rz = bvh_node.anim_data[current_frame + 1] + lx, ly, lz, rx, ry, rz = bvh_node.anim_data[frame_current + 1] if bvh_node.has_rot: bone_rotation_matrix = Euler(rx, ry, rz).to_matrix().resize4x4() @@ -565,7 +565,7 @@ class BvhImporter(bpy.types.Operator): path = StringProperty(name="File Path", description="File path used for importing the OBJ file", maxlen=1024, default="") scale = FloatProperty(name="Scale", description="Scale the BVH by this value", min=0.0001, max=1000000.0, soft_min=0.001, soft_max=100.0, default=0.1) - start_frame = IntProperty(name="Start Frame", description="Starting frame for the animation", default=1) + frame_start = IntProperty(name="Start Frame", description="Starting frame for the animation", default=1) loop = BoolProperty(name="Loop", description="Loop the animation playback", default=False) rotate_mode = EnumProperty(items=( ('QUATERNION', "Quaternion", "Convert rotations to quaternions"), @@ -597,7 +597,7 @@ class BvhImporter(bpy.types.Operator): bvh_node_dict2armature(context, bvh_nodes, ROT_MODE=self.properties.rotate_mode, - IMPORT_START_FRAME=self.properties.start_frame, + IMPORT_START_FRAME=self.properties.frame_start, IMPORT_LOOP=self.properties.loop) print('Done in %.4f\n' % (time.time() - t1)) diff --git a/release/scripts/io/import_shape_mdd.py b/release/scripts/io/import_shape_mdd.py index 106645eaa6b..37c99f899b1 100644 --- a/release/scripts/io/import_shape_mdd.py +++ b/release/scripts/io/import_shape_mdd.py @@ -55,7 +55,7 @@ def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1): basis.name = "Basis" ob.data.update() - scene.current_frame = PREF_START_FRAME + scene.frame_current = PREF_START_FRAME def UpdateMesh(ob, fr): @@ -82,15 +82,15 @@ def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1): # insert keyframes shape_keys = ob.data.shape_keys - scene.current_frame -= 1 + scene.frame_current -= 1 ob.data.shape_keys.keys[index].value = 0.0 shape_keys.keys[len(ob.data.shape_keys.keys)-1].keyframe_insert("value") - scene.current_frame += 1 + scene.frame_current += 1 ob.data.shape_keys.keys[index].value = 1.0 shape_keys.keys[len(ob.data.shape_keys.keys)-1].keyframe_insert("value") - scene.current_frame += 1 + scene.frame_current += 1 ob.data.shape_keys.keys[index].value = 0.0 shape_keys.keys[len(ob.data.shape_keys.keys)-1].keyframe_insert("value") @@ -120,7 +120,7 @@ class importMDD(bpy.types.Operator): # to the class instance from the operator settings before calling. path = StringProperty(name="File Path", description="File path used for importing the MDD file", maxlen=1024) #fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25) - start_frame = IntProperty(name="Start Frame", description="Start frame for inserting animation", min=minframe, max=maxframe, default=0) + frame_start = IntProperty(name="Start Frame", description="Start frame for inserting animation", min=minframe, max=maxframe, default=0) def poll(self, context): @@ -131,7 +131,7 @@ class importMDD(bpy.types.Operator): if not self.properties.path: raise Exception("filename not set") - mdd_import( self.properties.path, bpy.context.active_object, context.scene, self.properties.start_frame, 1) + mdd_import( self.properties.path, bpy.context.active_object, context.scene, self.properties.frame_start, 1) return {'FINISHED'} diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index 792a699bfe8..3acc0e1c2e1 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -96,10 +96,10 @@ def clientSendJob(conn, scene, anim = False): job = netrender.model.RenderJob() if anim: - for f in range(scene.start_frame, scene.end_frame + 1): + for f in range(scene.frame_start, scene.frame_end + 1): job.addFrame(f) else: - job.addFrame(scene.current_frame) + job.addFrame(scene.frame_current) filename = bpy.data.filename job.addFile(filename) @@ -228,7 +228,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine): self.update_stats("", "Network render waiting for results") - requestResult(conn, job_id, scene.current_frame) + requestResult(conn, job_id, scene.frame_current) response = conn.getresponse() if response.status == http.client.NO_CONTENT: @@ -236,12 +236,12 @@ class NetworkRenderEngine(bpy.types.RenderEngine): netsettings.job_id = clientSendJob(conn, scene) job_id = netsettings.job_id - requestResult(conn, job_id, scene.current_frame) + requestResult(conn, job_id, scene.frame_current) response = conn.getresponse() while response.status == http.client.ACCEPTED and not self.test_break(): time.sleep(1) - requestResult(conn, job_id, scene.current_frame) + requestResult(conn, job_id, scene.frame_current) response = conn.getresponse() # cancel new jobs (animate on network) on break diff --git a/release/scripts/modules/rigify/eye_balls.py b/release/scripts/modules/rigify/eye_balls.py index 9cb3c8229b0..8c126151024 100644 --- a/release/scripts/modules/rigify/eye_balls.py +++ b/release/scripts/modules/rigify/eye_balls.py @@ -241,8 +241,8 @@ def control(obj, definitions, base_names, options): con.subtarget = target_ctrl con.action = spread_action con.transform_channel = 'SCALE_X' - con.start_frame = -20 - con.end_frame = 20 + con.frame_start = -20 + con.frame_end = 20 con.minimum = 0.0 con.maximum = 2.0 con.target_space = 'LOCAL' diff --git a/release/scripts/modules/rigify/eye_lid.py b/release/scripts/modules/rigify/eye_lid.py index 39804e6b704..6eb1ff87d82 100644 --- a/release/scripts/modules/rigify/eye_lid.py +++ b/release/scripts/modules/rigify/eye_lid.py @@ -433,8 +433,8 @@ def control(obj, definitions, base_names, options): con.subtarget = upper_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance*2 con.maximum = distance con.target_space = 'LOCAL' @@ -452,8 +452,8 @@ def control(obj, definitions, base_names, options): con.subtarget = upper_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance*2 con.maximum = distance con.target_space = 'LOCAL' @@ -470,8 +470,8 @@ def control(obj, definitions, base_names, options): con.subtarget = upper_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance*2 con.maximum = distance con.target_space = 'LOCAL' @@ -488,8 +488,8 @@ def control(obj, definitions, base_names, options): con.subtarget = upper_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance*2 con.maximum = distance con.target_space = 'LOCAL' @@ -506,8 +506,8 @@ def control(obj, definitions, base_names, options): con.subtarget = upper_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance*2 con.maximum = distance con.target_space = 'LOCAL' @@ -525,8 +525,8 @@ def control(obj, definitions, base_names, options): con.subtarget = lower_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance con.maximum = distance*2 con.target_space = 'LOCAL' @@ -543,8 +543,8 @@ def control(obj, definitions, base_names, options): con.subtarget = lower_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance con.maximum = distance*2 con.target_space = 'LOCAL' @@ -561,8 +561,8 @@ def control(obj, definitions, base_names, options): con.subtarget = lower_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance con.maximum = distance*2 con.target_space = 'LOCAL' @@ -579,8 +579,8 @@ def control(obj, definitions, base_names, options): con.subtarget = lower_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance con.maximum = distance*2 con.target_space = 'LOCAL' @@ -597,8 +597,8 @@ def control(obj, definitions, base_names, options): con.subtarget = lower_lid_ctrl con.action = close_action con.transform_channel = 'LOCATION_Y' - con.start_frame = -30 - con.end_frame = 30 + con.frame_start = -30 + con.frame_end = 30 con.minimum = -distance con.maximum = distance*2 con.target_space = 'LOCAL' diff --git a/release/scripts/modules/rigify/mouth.py b/release/scripts/modules/rigify/mouth.py index 31d7c5a1ce9..4defd28f56a 100644 --- a/release/scripts/modules/rigify/mouth.py +++ b/release/scripts/modules/rigify/mouth.py @@ -543,8 +543,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -561,8 +561,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -579,8 +579,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -597,8 +597,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -615,8 +615,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -633,8 +633,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -651,8 +651,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' @@ -669,8 +669,8 @@ def control(obj, definitions, base_names, options): con.subtarget = jopent con.action = open_action con.transform_channel = 'SCALE_Y' - con.start_frame = 0 - con.end_frame = 60 + con.frame_start = 0 + con.frame_end = 60 con.minimum = 0.0 con.maximum = 1.0 con.target_space = 'LOCAL' diff --git a/release/scripts/op/nla.py b/release/scripts/op/nla.py index 99f5ec5cca9..da57bab3748 100644 --- a/release/scripts/op/nla.py +++ b/release/scripts/op/nla.py @@ -73,7 +73,7 @@ def pose_info(): return info -def bake(start_frame, end_frame, step=1, only_selected=False): +def bake(frame_start, frame_end, step=1, only_selected=False): # import nla; reload(nla); nla.bake() scene = bpy.context.scene @@ -82,7 +82,7 @@ def bake(start_frame, end_frame, step=1, only_selected=False): info_ls = [] - frame_range = range(start_frame, end_frame + 1, step) + frame_range = range(frame_start, frame_end + 1, step) # could spped this up by applying steps here too... for f in frame_range: @@ -103,7 +103,7 @@ def bake(start_frame, end_frame, step=1, only_selected=False): continue for f in frame_range: - matrix = info_ls[int((f-start_frame) / step)][name]["matrix_key"] + matrix = info_ls[int((f-frame_start) / step)][name]["matrix_key"] #pbone.location = matrix.translation_part() #pbone.rotation_quaternion = matrix.to_quat() @@ -149,10 +149,10 @@ class BakeAction(bpy.types.Operator): bl_label = "Bake Action" bl_options = {'REGISTER', 'UNDO'} - start_frame = IntProperty(name="Start Frame", + frame_start = IntProperty(name="Start Frame", description="Start frame for baking", default=1, min=1, max=300000) - end_frame = IntProperty(name="End Frame", + frame_end = IntProperty(name="End Frame", description="End frame for baking", default=250, min=1, max=300000) step = IntProperty(name="Frame Step", @@ -164,7 +164,7 @@ class BakeAction(bpy.types.Operator): def execute(self, context): props = self.properties - action = bake(props.start_frame, props.end_frame, props.step, props.only_selected) + action = bake(props.frame_start, props.frame_end, props.step, props.only_selected) # basic cleanup, could move elsewhere for fcu in action.fcurves: diff --git a/release/scripts/op/screen_play_rendered_anim.py b/release/scripts/op/screen_play_rendered_anim.py index e809251de7c..b7f75e5b439 100644 --- a/release/scripts/op/screen_play_rendered_anim.py +++ b/release/scripts/op/screen_play_rendered_anim.py @@ -103,7 +103,7 @@ class PlayRenderedAnim(bpy.types.Operator): file = ''.join([(c if file_b[i] == c else "#") for i, c in enumerate(file_a)]) else: # works for movies and images - file = rd.frame_path(frame=scene.start_frame) + file = rd.frame_path(frame=scene.frame_start) file = bpy.utils.expandpath(file) # expand '//' @@ -116,7 +116,7 @@ class PlayRenderedAnim(bpy.types.Operator): opts = [file, "-playback_speed", str(rd.fps)] cmd.extend(opts) elif preset == 'FRAMECYCLER': - opts = [file, "%d-%d" % (scene.start_frame, scene.end_frame)] + opts = [file, "%d-%d" % (scene.frame_start, scene.frame_end)] cmd.extend(opts) elif preset == 'RV': opts = ["-fps", str(rd.fps), "-play", "[ %s ]" % file] diff --git a/release/scripts/op/sequencer.py b/release/scripts/op/sequencer.py index 76d5c9cfee9..b3b674cb97e 100644 --- a/release/scripts/op/sequencer.py +++ b/release/scripts/op/sequencer.py @@ -49,22 +49,22 @@ class SequencerCrossfadeSounds(bpy.types.Operator): if seq2 == None: self.report({'ERROR'}, "Select 2 sound strips.") return {'CANCELLED'} - if seq1.start_frame_final > seq2.start_frame_final: + if seq1.frame_final_start > seq2.frame_final_start: s = seq1 seq1 = seq2 seq2 = s - if seq1.end_frame_final > seq2.start_frame_final: - tempcfra = context.scene.current_frame - context.scene.current_frame = seq2.start_frame_final + if seq1.frame_final_end > seq2.frame_final_start: + tempcfra = context.scene.frame_current + context.scene.frame_current = seq2.frame_final_start seq1.keyframe_insert('volume') - context.scene.current_frame = seq1.end_frame_final + context.scene.frame_current = seq1.frame_final_end seq1.volume = 0 seq1.keyframe_insert('volume') seq2.keyframe_insert('volume') - context.scene.current_frame = seq2.start_frame_final + context.scene.frame_current = seq2.frame_final_start seq2.volume = 0 seq2.keyframe_insert('volume') - context.scene.current_frame = tempcfra + context.scene.frame_current = tempcfra return {'FINISHED'} else: self.report({'ERROR'}, "The selected strips don't overlap.") diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/ui/properties_animviz.py index 15cd80c6fdf..311a8b119cf 100644 --- a/release/scripts/ui/properties_animviz.py +++ b/release/scripts/ui/properties_animviz.py @@ -49,8 +49,8 @@ class MotionPathButtonsPanel(bpy.types.Panel): sub.prop(mps, "before_current", text="Before") sub.prop(mps, "after_current", text="After") elif (mps.type == 'RANGE'): - sub.prop(mps, "start_frame", text="Start") - sub.prop(mps, "end_frame", text="End") + sub.prop(mps, "frame_start", text="Start") + sub.prop(mps, "frame_end", text="End") sub.prop(mps, "frame_step", text="Step") if bones: @@ -88,8 +88,8 @@ class OnionSkinButtonsPanel(bpy.types.Panel): sub = col.column(align=True) if arm.ghost_type == 'RANGE': - sub.prop(arm, "ghost_start_frame", text="Start") - sub.prop(arm, "ghost_end_frame", text="End") + sub.prop(arm, "ghost_frame_start", text="Start") + sub.prop(arm, "ghost_frame_end", text="End") sub.prop(arm, "ghost_size", text="Step") elif arm.ghost_type == 'CURRENT_FRAME': sub.prop(arm, "ghost_step", text="Range") diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/ui/properties_data_armature.py index 4f382d550e2..976c2ad78d5 100644 --- a/release/scripts/ui/properties_data_armature.py +++ b/release/scripts/ui/properties_data_armature.py @@ -186,8 +186,8 @@ class DATA_PT_ghost(DataButtonsPanel): sub = col.column(align=True) if arm.ghost_type == 'RANGE': - sub.prop(arm, "ghost_start_frame", text="Start") - sub.prop(arm, "ghost_end_frame", text="End") + sub.prop(arm, "ghost_frame_start", text="Start") + sub.prop(arm, "ghost_frame_end", text="End") sub.prop(arm, "ghost_size", text="Step") elif arm.ghost_type == 'CURRENT_FRAME': sub.prop(arm, "ghost_step", text="Range") diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index 47306dd92ac..481da716e02 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -496,8 +496,8 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column(align=True) col.label(text="Action Length:") - col.prop(con, "start_frame", text="Start") - col.prop(con, "end_frame", text="End") + col.prop(con, "frame_start", text="Start") + col.prop(con, "frame_end", text="End") if wide_ui: col = split.column(align=True) diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index 9b24115d492..372509773ef 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -53,8 +53,8 @@ def point_cache_ui(self, context, cache, enabled, particles, smoke): if not particles: row = layout.row() row.enabled = enabled - row.prop(cache, "start_frame") - row.prop(cache, "end_frame") + row.prop(cache, "frame_start") + row.prop(cache, "frame_end") row = layout.row() diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index c9795d62f71..2d20a948278 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -532,8 +532,8 @@ class RENDER_PT_dimensions(RenderButtonsPanel): col = split.column() sub = col.column(align=True) sub.label(text="Frame Range:") - sub.prop(scene, "start_frame", text="Start") - sub.prop(scene, "end_frame", text="End") + sub.prop(scene, "frame_start", text="Start") + sub.prop(scene, "frame_end", text="End") sub.prop(scene, "frame_step", text="Step") sub.label(text="Frame Rate:") diff --git a/release/scripts/ui/space_buttons.py b/release/scripts/ui/space_buttons.py index 019f751449f..9fc30a8189b 100644 --- a/release/scripts/ui/space_buttons.py +++ b/release/scripts/ui/space_buttons.py @@ -38,7 +38,7 @@ class Buttons_HT_header(bpy.types.Header): row = layout.row() row.prop(so, "buttons_context", expand=True, text="") - row.prop(scene, "current_frame") + row.prop(scene, "frame_current") class Buttons_MT_view(bpy.types.Menu): diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 9d7ac872c75..aada58806ad 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -347,20 +347,20 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): col = layout.column() col.enabled = not strip.lock col.prop(strip, "channel") - col.prop(strip, "start_frame") + col.prop(strip, "frame_start") subrow = col.split(percentage=0.66) subrow.prop(strip, "length") subrow.label(text="%.2f sec" % (strip.length / (render.fps / render.fps_base))) col = layout.column(align=True) col.label(text="Offset:") - col.prop(strip, "start_offset", text="Start") - col.prop(strip, "end_offset", text="End") + col.prop(strip, "frame_offset_start", text="Start") + col.prop(strip, "frame_offset_end", text="End") col = layout.column(align=True) col.label(text="Still:") - col.prop(strip, "start_still", text="Start") - col.prop(strip, "end_still", text="End") + col.prop(strip, "frame_still_start", text="Start") + col.prop(strip, "frame_still_end", text="End") class SEQUENCER_PT_preview(bpy.types.Panel): @@ -579,7 +579,7 @@ class SEQUENCER_PT_input_image(SEQUENCER_PT_input): # Current element for the filename - elem = strip.getStripElem(context.scene.current_frame) + elem = strip.getStripElem(context.scene.frame_current) if elem: split = layout.split(percentage=0.2) col = split.column() diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index cfd5fdfce0b..7417b9659b2 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -43,13 +43,13 @@ class TIME_HT_header(bpy.types.Header): row = layout.row(align=True) if not scene.use_preview_range: - row.prop(scene, "start_frame", text="Start") - row.prop(scene, "end_frame", text="End") + row.prop(scene, "frame_start", text="Start") + row.prop(scene, "frame_end", text="End") else: - row.prop(scene, "preview_range_start_frame", text="Start") - row.prop(scene, "preview_range_end_frame", text="End") + row.prop(scene, "preview_range_frame_start", text="Start") + row.prop(scene, "preview_range_frame_end", text="End") - layout.prop(scene, "current_frame", text="") + layout.prop(scene, "frame_current", text="") layout.separator() diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index e288b79f152..326a97825d9 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -710,7 +710,7 @@ class USERPREF_PT_theme(bpy.types.Panel): col.prop(graph, "vertex") col = split.column() - col.prop(graph, "current_frame") + col.prop(graph, "frame_current") col.prop(graph, "handle_vertex") col.prop(graph, "handle_vertex_select") col.separator() @@ -757,7 +757,7 @@ class USERPREF_PT_theme(bpy.types.Panel): col = split.column() col.prop(nla, "strips") col.prop(nla, "strips_selected") - col.prop(nla, "current_frame") + col.prop(nla, "frame_current") elif theme.theme_area == 'DOPESHEET_EDITOR': dope = theme.dopesheet_editor @@ -780,7 +780,7 @@ class USERPREF_PT_theme(bpy.types.Panel): col.prop(dope, "long_key_selected") col = split.column() - col.prop(dope, "current_frame") + col.prop(dope, "frame_current") col.prop(dope, "dopesheet_channel") col.prop(dope, "dopesheet_subchannel") @@ -827,7 +827,7 @@ class USERPREF_PT_theme(bpy.types.Panel): col = split.column() col.prop(seq, "meta_strip") - col.prop(seq, "current_frame") + col.prop(seq, "frame_current") col.prop(seq, "keyframe") col.prop(seq, "draw_action") @@ -886,7 +886,7 @@ class USERPREF_PT_theme(bpy.types.Panel): col.prop(time, "grid") col = split.column() - col.prop(time, "current_frame") + col.prop(time, "frame_current") elif theme.theme_area == 'NODE_EDITOR': node = theme.node_editor diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 4b6a3a7e8e4..ab2a6f713cb 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -830,8 +830,8 @@ void BKE_nlameta_flush_transforms (NlaStrip *mstrip) strip->end= nEnd; RNA_pointer_create(NULL, &RNA_NlaStrip, strip, &ptr); - RNA_float_set(&ptr, "start_frame", nStart); - RNA_float_set(&ptr, "end_frame", nEnd); + RNA_float_set(&ptr, "frame_start", nStart); + RNA_float_set(&ptr, "frame_end", nEnd); } else { /* just apply the changes in offset to both ends of the strip */ diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index c6ee9e4a960..3bd8b50c889 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -572,19 +572,19 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho /* block 2: start range settings */ col= uiLayoutColumn(layout, 1); - uiItemR(col, &ptr, "use_start_frame", 0, NULL, 0); + uiItemR(col, &ptr, "use_frame_start", 0, NULL, 0); subcol = uiLayoutColumn(col, 1); - uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_start_frame")); - uiItemR(subcol, &ptr, "start_frame", 0, NULL, 0); + uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_start")); + uiItemR(subcol, &ptr, "frame_start", 0, NULL, 0); /* block 3: end range settings */ col= uiLayoutColumn(layout, 1); - uiItemR(col, &ptr, "use_end_frame", 0, NULL, 0); + uiItemR(col, &ptr, "use_frame_end", 0, NULL, 0); subcol = uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_end_frame")); - uiItemR(subcol, &ptr, "end_frame", 0, NULL, 0); + uiItemR(subcol, &ptr, "frame_end", 0, NULL, 0); } /* --------------- */ diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index ac3b91e275c..5751fb0300e 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -156,7 +156,7 @@ static void graph_panel_view(const bContext *C, Panel *pa) subcol= uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); row= uiLayoutSplit(subcol, 0.7, 1); - uiItemR(row, &sceneptr, "current_frame", 0, "Cursor X", 0); + uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", 0); uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA); row= uiLayoutSplit(subcol, 0.7, 1); uiItemR(row, &spaceptr, "cursor_value", 0, "Cursor Y", 0); diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 0a7c07bd1f1..aa3a0f58fa9 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -906,7 +906,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn uiButSetFunc(but, set_frames_cb, ima, iuser); } - uiItemR(col, userptr, "start_frame", 0, "Start", 0); + uiItemR(col, userptr, "frame_start", 0, "Start", 0); uiItemR(col, userptr, "offset", 0, NULL, 0); col= uiLayoutColumn(split, 0); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index ceee7fc9971..9b7bc9a8002 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -295,8 +295,8 @@ static void nla_panel_properties(const bContext *C, Panel *pa) /* strip extents */ column= uiLayoutColumn(layout, 1); uiItemL(column, "Strip Extents:", 0); - uiItemR(column, &strip_ptr, "start_frame", 0, NULL, 0); - uiItemR(column, &strip_ptr, "end_frame", 0, NULL, 0); + uiItemR(column, &strip_ptr, "frame_start", 0, NULL, 0); + uiItemR(column, &strip_ptr, "frame_end", 0, NULL, 0); /* extrapolation */ row= uiLayoutRow(layout, 1); @@ -351,8 +351,8 @@ static void nla_panel_actclip(const bContext *C, Panel *pa) // XXX custom names were used here (to avoid the prefixes)... probably not necessary in future? column= uiLayoutColumn(layout, 1); uiItemL(column, "Action Extents:", 0); - uiItemR(column, &strip_ptr, "action_start_frame", 0, "Start Frame", 0); - uiItemR(column, &strip_ptr, "action_end_frame", 0, "End Frame", 0); + uiItemR(column, &strip_ptr, "action_frame_start", 0, "Start Frame", 0); + uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", 0); uiItemO(column, NULL, 0, "NLA_OT_action_sync_length"); /* action usage */ diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 3a91b5c7210..5ba2c1c27c8 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -894,8 +894,8 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *C, Pointe } row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "start_frame", 0, "Start", 0); - uiItemR(row, ptr, "end_frame", 0, "End", 0); + uiItemR(row, ptr, "frame_start", 0, "Start", 0); + uiItemR(row, ptr, "frame_end", 0, "End", 0); } static void node_composit_buts_scale(uiLayout *layout, bContext *C, PointerRNA *ptr) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 22d94621673..b8c233bfe3e 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -88,10 +88,10 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) RNA_def_string(ot->srna, "name", "", MAX_ID_NAME-2, "Name", "Name of the new sequence strip"); if(flag & SEQPROP_STARTFRAME) - RNA_def_int(ot->srna, "start_frame", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); if(flag & SEQPROP_ENDFRAME) - RNA_def_int(ot->srna, "end_frame", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */ + RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */ RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, "Channel", "Channel to place this strip into", 1, MAXSEQ); @@ -116,10 +116,10 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w UI_view2d_region_to_view(v2d, mval[0], mval[1], &mval_v2d[0], &mval_v2d[1]); RNA_int_set(op->ptr, "channel", (int)mval_v2d[1]+0.5f); - RNA_int_set(op->ptr, "start_frame", (int)mval_v2d[0]); + RNA_int_set(op->ptr, "frame_start", (int)mval_v2d[0]); - if ((flag & SEQPROP_ENDFRAME) && RNA_property_is_set(op->ptr, "end_frame")==0) - RNA_int_set(op->ptr, "end_frame", (int)mval_v2d[0] + 25); // XXX arbitary but ok for now. + if ((flag & SEQPROP_ENDFRAME) && RNA_property_is_set(op->ptr, "frame_end")==0) + RNA_int_set(op->ptr, "frame_end", (int)mval_v2d[0] + 25); // XXX arbitary but ok for now. } @@ -127,7 +127,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) { memset(seq_load, 0, sizeof(SeqLoadInfo)); - seq_load->start_frame= RNA_int_get(op->ptr, "start_frame"); + seq_load->start_frame= RNA_int_get(op->ptr, "frame_start"); seq_load->end_frame= seq_load->start_frame; /* un-set */ seq_load->channel= RNA_int_get(op->ptr, "channel"); @@ -137,8 +137,8 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) RNA_string_get(op->ptr, "path", seq_load->path); /* full path, file is set by the caller */ - if (RNA_struct_find_property(op->ptr, "end_frame")) { - seq_load->end_frame = RNA_int_get(op->ptr, "end_frame"); + if (RNA_struct_find_property(op->ptr, "frame_end")) { + seq_load->end_frame = RNA_int_get(op->ptr, "frame_end"); } if (RNA_struct_find_property(op->ptr, "replace_sel") && RNA_boolean_get(op->ptr, "replace_sel")) @@ -168,7 +168,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) int start_frame, channel; /* operator props */ - start_frame= RNA_int_get(op->ptr, "start_frame"); + start_frame= RNA_int_get(op->ptr, "frame_start"); channel= RNA_int_get(op->ptr, "channel"); sce_seq= BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene")); @@ -489,8 +489,8 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) Sequence *seq1, *seq2, *seq3; char *error_msg; - start_frame= RNA_int_get(op->ptr, "start_frame"); - end_frame= RNA_int_get(op->ptr, "end_frame"); + start_frame= RNA_int_get(op->ptr, "frame_start"); + end_frame= RNA_int_get(op->ptr, "frame_end"); channel= RNA_int_get(op->ptr, "channel"); type= RNA_enum_get(op->ptr, "type"); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 0e47034d881..d27b9f4795c 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -558,8 +558,8 @@ void recalcData(TransInfo *t) // TODO: do we need to write in 2 passes to make sure that no truncation goes on? RNA_pointer_create(NULL, &RNA_NlaStrip, strip, &strip_ptr); - RNA_float_set(&strip_ptr, "start_frame", tdn->h1[0]); - RNA_float_set(&strip_ptr, "end_frame", tdn->h2[0]); + RNA_float_set(&strip_ptr, "frame_start", tdn->h1[0]); + RNA_float_set(&strip_ptr, "frame_end", tdn->h2[0]); /* flush transforms to child strips (since this should be a meta) */ BKE_nlameta_flush_transforms(strip); diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 004b5eef571..23698e8140f 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -316,13 +316,13 @@ static void rna_def_ipo_actuator(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Ipo Type", "Specify the way you want to play the animation"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sta"); RNA_def_property_ui_range(prop, 1, MAXFRAME, 1, 1); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_update(prop, NC_SCENE, NULL); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "end"); RNA_def_property_ui_range(prop, 1, MAXFRAME, 1, 1); RNA_def_property_ui_text(prop, "End Frame", ""); @@ -1087,13 +1087,13 @@ static void rna_def_shape_action_actuator(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Property", "Use this property to define the Action position"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sta"); RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_text(prop, "Start frame", ""); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "end"); RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_text(prop, "End frame", ""); diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 9be14f8e2cf..95ff202a2d8 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -125,11 +125,13 @@ static void rna_def_animviz_motion_path(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Motion Path Points", "Cached positions per frame"); /* Playback Ranges */ - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); + RNA_def_property_int_sdna(prop, NULL, "start_frame"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Start Frame", "Starting frame of the stored range"); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); + RNA_def_property_int_sdna(prop, NULL, "end_frame"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "End Frame", "End frame of the stored range"); @@ -188,13 +190,13 @@ static void rna_def_animviz_ghosts(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ /* Playback Ranges */ - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghost_sf"); RNA_def_property_int_funcs(prop, NULL, "rna_AnimViz_ghost_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Start Frame", "Starting frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghost_ef"); RNA_def_property_int_funcs(prop, NULL, "rna_AnimViz_ghost_end_frame_set", NULL); RNA_def_property_ui_text(prop, "End Frame", "End frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method)"); @@ -270,13 +272,13 @@ static void rna_def_animviz_paths(BlenderRNA *brna) /* Playback Ranges */ - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "path_sf"); RNA_def_property_int_funcs(prop, NULL, "rna_AnimViz_path_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Start Frame", "Starting frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "path_ef"); RNA_def_property_int_funcs(prop, NULL, "rna_AnimViz_path_end_frame_set", NULL); RNA_def_property_ui_text(prop, "End Frame", "End frame of range of paths to display/calculate (not for 'Around Current Frame' Onion-skinning method)"); diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index e592f930778..137e9cece2c 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -888,14 +888,14 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - prop= RNA_def_property(srna, "ghost_start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "ghost_frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghostsf"); RNA_def_property_int_funcs(prop, NULL, "rna_Armature_ghost_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Ghosting Start Frame", "Starting frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method)"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - prop= RNA_def_property(srna, "ghost_end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "ghost_frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghostef"); RNA_def_property_int_funcs(prop, NULL, "rna_Armature_ghost_end_frame_set", NULL); RNA_def_property_ui_text(prop, "Ghosting End Frame", "End frame of range of Ghosts to display (not for 'Around Current Frame' Onion-skinning method)"); diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 5eb41136350..6947c94872e 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -963,13 +963,13 @@ static void rna_def_constraint_action(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "start"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); RNA_def_property_ui_text(prop, "Start Frame", "First frame of the Action to use"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "end"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); RNA_def_property_ui_text(prop, "End Frame", "Last frame of the Action to use"); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index c1887a40583..7f85f0f5e2d 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -871,22 +871,24 @@ static void rna_def_fmodifier_stepped(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Offset", "Reference number of frames before frames get held. Use to get hold for '1-3' vs '5-7' holding patterns"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); - prop= RNA_def_property(srna, "use_start_frame", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_frame_start", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_STEPPED_NO_BEFORE); RNA_def_property_ui_text(prop, "Use Start Frame", "Restrict modifier to only act after its 'start' frame"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); - prop= RNA_def_property(srna, "use_end_frame", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_frame_end", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_STEPPED_NO_AFTER); RNA_def_property_ui_text(prop, "Use End Frame", "Restrict modifier to only act before its 'end' frame"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); - prop= RNA_def_property(srna, "start_frame", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "start_frame"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierStepped_start_frame_range"); RNA_def_property_ui_text(prop, "Start Frame", "Frame that modifier's influence starts (if applicable)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); - prop= RNA_def_property(srna, "end_frame", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "end_frame"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierStepped_end_frame_range"); RNA_def_property_ui_text(prop, "End Frame", "Frame that modifier's influence ends (if applicable)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index f009db229d3..7fc9673f3e5 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -241,7 +241,7 @@ static void rna_def_imageuser(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation"); RNA_def_property_update(prop, 0, "rna_ImageUser_update"); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "sfra"); RNA_def_property_range(prop, 1.0f, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start Frame", "Sets the global starting frame of the movie"); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index e3a31414356..accb40d2223 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -320,13 +320,13 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Blending", "Method used for combining strip's result with accumulated result"); /* Strip extents */ - prop= RNA_def_property(srna, "start_frame", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "start"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_update(prop, 0, "rna_NlaStrip_transform_update"); - prop= RNA_def_property(srna, "end_frame", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "end"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_end_frame_set", NULL); RNA_def_property_ui_text(prop, "End Frame", ""); @@ -354,12 +354,12 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Action", "Action referenced by this strip"); /* Action extents */ - prop= RNA_def_property(srna, "action_start_frame", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "action_frame_start", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "actstart"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_action_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Action Start Frame", ""); - prop= RNA_def_property(srna, "action_end_frame", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "action_frame_end", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "actend"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_action_end_frame_set", NULL); RNA_def_property_ui_text(prop, "Action End Frame", ""); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 6a30a78cd02..2227304c7e3 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1144,13 +1144,13 @@ static void def_cmp_output_file(StructRNA *srna) RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); // TODO: should these be limited to the extents of the each other so that no cross-over occurs? - prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sfra"); RNA_def_property_range(prop, MINFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "end_frame", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "efra"); RNA_def_property_range(prop, MINFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "End Frame", ""); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 4a74833bf7b..56f6792bdf1 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -677,12 +677,12 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Point Cache", "Point cache for physics simulations"); RNA_def_struct_ui_icon(srna, ICON_PHYSICS); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "startframe"); RNA_def_property_range(prop, 1, 300000); RNA_def_property_ui_text(prop, "Start", "Frame on which the simulation starts"); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "endframe"); RNA_def_property_range(prop, 1, 300000); RNA_def_property_ui_text(prop, "End", "Frame on which the simulation stops"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 00b2f1d56e7..c328f024039 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2792,7 +2792,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE|ND_LAYER, "rna_Scene_layer_update"); /* Frame Range Stuff */ - prop= RNA_def_property(srna, "current_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_current", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.cfra"); RNA_def_property_range(prop, MINAFRAME, MAXFRAME); @@ -2801,7 +2801,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_frame_update"); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.sfra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_start_frame_set", NULL); @@ -2809,7 +2809,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Start Frame", "First frame of the playback/rendering range"); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); - prop= RNA_def_property(srna, "end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.efra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_end_frame_set", NULL); @@ -2833,14 +2833,14 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Preview Range", ""); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); - prop= RNA_def_property(srna, "preview_range_start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "preview_range_frame_start", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.psfra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_preview_range_start_frame_set", NULL); RNA_def_property_ui_text(prop, "Preview Range Start Frame", ""); RNA_def_property_update(prop, NC_SCENE|ND_FRAME, NULL); - prop= RNA_def_property(srna, "preview_range_end_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "preview_range_frame_end", PROP_INT, PROP_TIME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_sdna(prop, NULL, "r.pefra"); RNA_def_property_int_funcs(prop, NULL, "rna_Scene_preview_range_end_frame_set", NULL); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index ac3a17427ba..950d9bc720c 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -628,47 +628,47 @@ static void rna_def_sequence(BlenderRNA *brna) RNA_def_property_int_funcs(prop, "rna_Sequence_length_get", "rna_Sequence_length_set",NULL); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "start_frame", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "start"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_start_frame_set",NULL); // overlap tests and calc_seq_disp RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "start_frame_final", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_final_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "startdisp"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Start Frame", "Start frame displayed in the sequence editor after offsets are applied, setting this is equivilent to moving the handle, not the actual start frame"); RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_start_frame_final_set", NULL); // overlap tests and calc_seq_disp RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "end_frame_final", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_final_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "enddisp"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "End Frame", "End frame displayed in the sequence editor after offsets are applied"); RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_end_frame_final_set", NULL); // overlap tests and calc_seq_disp RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "start_offset", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_offset_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "startofs"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap tests RNA_def_property_ui_text(prop, "Start Offset", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "end_offset", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_offset_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "endofs"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap tests RNA_def_property_ui_text(prop, "End offset", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "start_still", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_still_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "startstill"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap tests RNA_def_property_range(prop, 0, MAXFRAME); RNA_def_property_ui_text(prop, "Start Still", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "end_still", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_still_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "endstill"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); // overlap tests RNA_def_property_range(prop, 0, MAXFRAME); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 881df6eb494..f5d6f1a6f79 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -877,7 +877,7 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bone Pose", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -921,7 +921,7 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna) rna_def_userdef_theme_spaces_vertex(srna); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -1288,7 +1288,7 @@ static void rna_def_userdef_theme_space_time(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Grid", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -1319,7 +1319,7 @@ static void rna_def_userdef_theme_space_sound(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Window Sliders", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -1425,7 +1425,7 @@ static void rna_def_userdef_theme_space_seq(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Meta Strip", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -1510,7 +1510,7 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Long Key Selected", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); @@ -1577,7 +1577,7 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Strips Selected", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "current_frame", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "cframe"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Current Frame", ""); |