[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4148] contrib/py/scripts/addons/ sequencer_extra_actions:
carlos padial
palidoestudio2 at gmail.com
Sun Jan 6 23:19:47 CET 2013
Revision: 4148
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4148
Author: carlospadial
Date: 2013-01-06 22:19:46 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
more bpy.context.scene fixes
Modified Paths:
--------------
contrib/py/scripts/addons/sequencer_extra_actions/__init__.py
contrib/py/scripts/addons/sequencer_extra_actions/functions.py
contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py
contrib/py/scripts/addons/sequencer_extra_actions/ui.py
Modified: contrib/py/scripts/addons/sequencer_extra_actions/__init__.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/__init__.py 2013-01-06 13:13:52 UTC (rev 4147)
+++ contrib/py/scripts/addons/sequencer_extra_actions/__init__.py 2013-01-06 22:19:46 UTC (rev 4148)
@@ -35,11 +35,9 @@
import imp
imp.reload(operators_extra_actions)
imp.reload(ui)
- #imp.reload(operators_recursive)
else:
from . import operators_extra_actions
from . import ui
- #from . import operators_recursive
import bpy
import os.path
@@ -91,4 +89,4 @@
if __name__ == '__main__':
- register()
+ register()
\ No newline at end of file
Modified: contrib/py/scripts/addons/sequencer_extra_actions/functions.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/functions.py 2013-01-06 13:13:52 UTC (rev 4147)
+++ contrib/py/scripts/addons/sequencer_extra_actions/functions.py 2013-01-06 22:19:46 UTC (rev 4148)
@@ -70,8 +70,8 @@
# Functions
-def add_marker(text):
- scene = bpy.context.scene
+def add_marker(context, text):
+ scene = context.scene
markers = scene.timeline_markers
mark = markers.new(name=text)
mark.frame = scene.frame_current
@@ -191,42 +191,17 @@
# recursive load functions
-def loader(filelist):
- scn = bpy.context.scene
- if filelist:
- for i in filelist:
- setpathinbrowser(i[0], i[1])
- try:
- if scn.default_recursive_proxies:
- bpy.ops.sequencerextra.placefromfilebrowserproxy(
- proxy_suffix=scn.default_proxy_suffix,
- proxy_extension=scn.default_proxy_extension,
- proxy_path=scn.default_proxy_path,
- build_25=scn.default_build_25,
- build_50=scn.default_build_50,
- build_75=scn.default_build_75,
- build_100=scn.default_build_100)
- else:
- bpy.ops.sequencerextra.placefromfilebrowser()
- except:
- print("Error loading file (recursive loader error): ", i[1])
- add_marker(i[1])
- #self.report({'ERROR_INVALID_INPUT'}, 'Error loading file ')
- #return {'CANCELLED'}
- pass
-
-def onefolder():
+def onefolder(context, default_recursive_ext):
'''
returns a list of MOVIE type files from folder selected in file browser
'''
filelist = []
path, filename = getfilepathfrombrowser()
extension = filename.rpartition(".")[2]
- #extension = scn.default_ext
- scn = bpy.context.scene
+ scn = context.scene
if detect_strip_type(path + filename) == 'MOVIE':
- if scn.default_recursive_ext == True:
+ if default_recursive_ext == True:
for file in os.listdir(path):
if file.rpartition(".")[2] == extension:
filelist.append((path, file))
@@ -235,20 +210,20 @@
filelist.append((path, file))
return (filelist)
-def recursive():
+def recursive(context, default_recursive_ext):
'''
returns a list of MOVIE type files recursively from file browser
'''
filelist = []
path = getpathfrombrowser()
- scn = bpy.context.scene
+ scn = context.scene
for i in movieextlist:
if i[0] == scn.default_ext:
extension = i[1].rpartition(".")[2]
#pythonic way to magic:
for root, dirs, files in os.walk(path):
for f in files:
- if scn.default_recursive_ext == True:
+ if default_recursive_ext == True:
if f.rpartition(".")[2] == extension:
filelist.append((root, f))
else:
@@ -297,5 +272,3 @@
newlist.append([lst[count : int(lista[i]-1)+count]])
count += int(lista[i])
return newlist
-
-
Modified: contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py 2013-01-06 13:13:52 UTC (rev 4147)
+++ contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py 2013-01-06 22:19:46 UTC (rev 4148)
@@ -39,9 +39,10 @@
# Initialization
-def initSceneProperties(scn):
+
+def initSceneProperties(context, scn):
try:
- if bpy.context.scene.scene_initialized == True:
+ if context.scene.scene_initialized == True:
return False
except AttributeError:
pass
@@ -129,13 +130,13 @@
description='Load in recursive folders',
default=False)
scn.default_recursive = False
-
+
bpy.types.Scene.default_recursive_ext = BoolProperty(
name='Recursive ext',
description='Load only clips with selected extension',
default=False)
scn.default_recursive_ext = False
-
+
bpy.types.Scene.default_recursive_proxies = BoolProperty(
name='Recursive proxies',
description='Load in recursive folders + proxies',
@@ -147,17 +148,15 @@
name="ext enum",
default="3")
scn.default_ext = "3"
-
+
bpy.types.Scene.scene_initialized = BoolProperty(
name='Init',
default=False)
scn.scene_initialized = True
-
-
return True
-
+
# TRIM TIMELINE
class Sequencer_Extra_TrimTimeline(bpy.types.Operator):
bl_label = 'Trim to Timeline Content'
@@ -294,7 +293,7 @@
def invoke(self, context, event):
scn = context.scene
- initSceneProperties(scn)
+ initSceneProperties(context,scn)
self.slide_offset = scn.default_slide_offset
if self.mode == 'INPUT':
return context.window_manager.invoke_props_dialog(self)
@@ -1061,6 +1060,18 @@
default='IN',
)
bl_options = {'REGISTER', 'UNDO'}
+
+ fade_duration = IntProperty(
+ name='Duration',
+ description='Number of frames to fade',
+ min=1, max=250,
+ default=25)
+ fade_amount = FloatProperty(
+ name='Amount',
+ description='Maximum value of fade',
+ min=0.0,
+ max=100.0,
+ default=1.0)
@classmethod
def poll(cls, context):
@@ -1142,7 +1153,7 @@
def invoke(self, context, event):
scn = context.scene
- initSceneProperties(scn)
+ initSceneProperties(context, scn)
self.fade_duration = scn.default_fade_duration
self.fade_amount = scn.default_fade_amount
return context.window_manager.invoke_props_dialog(self)
@@ -1241,7 +1252,7 @@
def invoke(self, context, event):
scn = context.scene
- initSceneProperties(scn)
+ initSceneProperties(context, scn)
self.distribute_offset = scn.default_distribute_offset
self.distribute_reverse = scn.default_distribute_reverse
return context.window_manager.invoke_props_dialog(self)
@@ -1409,14 +1420,37 @@
bl_idname = 'sequencerextra.placefromfilebrowserproxy'
bl_description = 'Place or insert active file from File Browser, '\
'and add proxy file with according suffix and extension'
- insert = BoolProperty(
- name='Insert',
- default=False)
+ insert = BoolProperty(name='Insert', default=False)
+ build_25 = BoolProperty(name='default_build_25',
+ description='default build_25',
+ default=True)
+ build_50 = BoolProperty(name='default_build_50',
+ description='default build_50',
+ default=True)
+ build_75 = BoolProperty(name='default_build_75',
+ description='default build_75',
+ default=True)
+ build_100 = BoolProperty(name='default_build_100',
+ description='default build_100',
+ default=True)
+ proxy_suffix = StringProperty(
+ name='default proxy suffix',
+ description='default proxy filename suffix',
+ default="-25")
+ proxy_extension = StringProperty(
+ name='default proxy extension',
+ description='default proxy extension',
+ default=".mkv")
+ proxy_path = StringProperty(
+ name='default proxy path',
+ description='default proxy path',
+ default="")
bl_options = {'REGISTER', 'UNDO'}
def invoke(self, context, event):
scn = context.scene
+ initSceneProperties(context, scn)
self.build_25 = scn.default_build_25
self.build_50 = scn.default_build_50
self.build_75 = scn.default_build_75
@@ -1664,13 +1698,109 @@
bl_idname = "sequencerextra.recursiveload"
bl_label = "recursive load"
bl_options = {'REGISTER', 'UNDO'}
+
+ default_recursive = BoolProperty(
+ name='Recursive',
+ description='Load in recursive folders',
+ default=False)
+
+ default_recursive_ext = BoolProperty(
+ name='Recursive extension',
+ description='Load in recursive folders',
+ default=False)
+
+ default_ext = EnumProperty(
+ items=functions.movieextdict,
+ name="ext enum",
+ default="3")
+
+ default_recursive_proxies = BoolProperty(
+ name='Recursive proxies',
+ description='Load in recursive folders',
+ default=False)
+ build_25 = BoolProperty(name='default_build_25',
+ description='default build_25',
+ default=True)
+ build_50 = BoolProperty(name='default_build_50',
+ description='default build_50',
+ default=True)
+ build_75 = BoolProperty(name='default_build_75',
+ description='default build_75',
+ default=True)
+ build_100 = BoolProperty(name='default_build_100',
+ description='default build_100',
+ default=True)
+ proxy_suffix = StringProperty(
+ name='default proxy suffix',
+ description='default proxy filename suffix',
+ default="-25")
+ proxy_extension = StringProperty(
+ name='default proxy extension',
+ description='default proxy extension',
+ default=".mkv")
+ proxy_path = StringProperty(
+ name='default proxy path',
+ description='default proxy path',
+ default="")
+
+
+
+ @classmethod
+ def poll(self, context):
+ scn = context.scene
+ if scn and scn.sequence_editor:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list