Skip to content

Fixed moving in Blender UI and refresh for relative paths #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
25216ea
Added Enable/Disable All and the option to select a root directory fo…
Dec 7, 2022
2344d8e
Added first version of bin file format
justo46 Mar 7, 2023
0f575de
Added bin.py
justo46 Mar 9, 2023
cf201a8
Fixed byte errors and store the rest of the bytes in an (unused) list
justo46 Mar 13, 2023
66a2180
Added 1 main commit
justo46 Mar 13, 2023
7cb6fe1
Added main commit
justo46 Mar 13, 2023
f410be3
Merge commit
justo46 Mar 13, 2023
5f8be5a
Added a button to select multiple sequences
justo46 Mar 15, 2023
30cd9b4
Added the functionality to import multiple sequences (in top menu and…
justo46 Mar 27, 2023
ea852b9
Added object property for initial transformation matrix, made for mul…
justo46 Mar 27, 2023
341cbad
Added install script
justo46 Mar 29, 2023
fb9f982
Fixed keyframe animation system to work with other transformations
justo46 Mar 29, 2023
f6c5ac2
Optimized adding meshio objects and added a button to refresh the seq…
justo46 Mar 29, 2023
c8d12e2
Fixed keyframe system for multiple files
justo46 Mar 31, 2023
31fc32b
Merge remote-tracking branch 'upstream/main'
justo46 Mar 31, 2023
7c276a0
Deleted install file from repo, since this is a local file.
justo46 Mar 31, 2023
53d9cfd
Resolved further changes
justo46 Mar 31, 2023
f38ae77
Updated version + test to import MeshIO Objects
justo46 Mar 31, 2023
1903ce3
Updated version
justo46 Mar 31, 2023
a7d5e99
Deleted some comments and made the code easier to read
justo46 Mar 31, 2023
d9bebfa
Further code improvements
justo46 Mar 31, 2023
785d229
Removed bin.py
justo46 Mar 31, 2023
7f70202
Deleted import of bin.py and corrected version
justo46 Mar 31, 2023
c120f7d
Fixed transforming via viewport (except for .bin)
justo46 Apr 7, 2023
d9d5c78
This breaks the bin format but enables in-view transformations again
justo46 Apr 17, 2023
784954a
Merge branch 'main' of https://github.com/justo46/blender-sequence-lo…
justo46 Apr 17, 2023
7ac8423
Deleted property & Fix refresh for relative paths
justo46 May 4, 2023
5d962fc
Deleted old comment
justo46 May 4, 2023
0b984c3
Added set to timeline button
justo46 May 4, 2023
c799519
Set timeline button is atm working on select obj!
justo46 May 4, 2023
1b8c070
Better set timeline button
justo46 May 10, 2023
2fcf0a7
Fixed start and end frames
justo46 May 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main'
  • Loading branch information
justo46 committed Mar 31, 2023
commit 31fc32ba131a4f1c9ee81a19addea55a7c20bacb
8 changes: 4 additions & 4 deletions bseq/callback.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ def update_path(self, context):
context.scene.BSEQ.use_pattern = False
context.scene.BSEQ.pattern = ""

'''
Detects all the file sequences in the directory
'''

p = context.scene.BSEQ.path
try:
f = fileseq.findSequencesOnDisk(p)
Expand All @@ -31,13 +35,9 @@ def update_path(self, context):


def item_fileseq(self, context):
'''
Detects all the file sequences in the directory
'''
return file_sequences



def update_selected_obj_num(self, context):

# Here is when select sequences, then change the corresponding object to active object
Expand Down
1 change: 1 addition & 0 deletions bseq/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ def update_obj(scene, depsgraph=None):
pattern = bpy.path.abspath(pattern, start=scene.BSEQ.root_path)
else:
pattern = bpy.path.abspath(pattern)

# in case the blender file was created on windows system, but opened in linux system
pattern = bpy.path.native_pathsep(pattern)
fs = fileseq.FileSequence(pattern)
Expand Down
33 changes: 33 additions & 0 deletions bseq/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@ def execute(self, context):
show_message_box(traceback.format_exc(), "Can't find sequence: " + str(fs), "ERROR")
return {"CANCELLED"}

<<<<<<< HEAD
transform_matrix = Matrix.Identity(4)
if importer_prop.use_custom_transform:
transform_matrix = Matrix.LocRotScale(importer_prop.custom_location, importer_prop.custom_rotation, importer_prop.custom_scale)

create_obj(fs, importer_prop.relative, importer_prop.root_path, transform_matrix=transform_matrix)
=======
create_obj(fs, importer_prop.relative, importer_prop.root_path)
>>>>>>> upstream/main
return {"FINISHED"}


Expand Down Expand Up @@ -276,6 +280,7 @@ def execute(self, context):
scene = context.scene
obj = bpy.data.objects[scene.BSEQ.selected_obj_num]
refresh_obj(obj, scene)
<<<<<<< HEAD

return {"FINISHED"}

Expand Down Expand Up @@ -308,13 +313,16 @@ class BSEQ_OT_refresh_sequences(bpy.types.Operator):
bl_label = "" #"Refresh Found Sequences"
bl_idname = "bseq.refreshseqs"
bl_options = {"UNDO"}
=======
>>>>>>> upstream/main

def execute(self, context):
scene = context.scene
# call the update function of path by setting it to its own value
scene.BSEQ.path = scene.BSEQ.path
return {"FINISHED"}

<<<<<<< HEAD
from pathlib import Path
import meshio
from bpy_extras.io_utils import ImportHelper
Expand Down Expand Up @@ -372,3 +380,28 @@ def menu_func_import(self, context):
self.layout.operator(
WM_OT_MeshioObject.bl_idname,
text="Batch Meshio Object")
=======
class BSEQ_OT_disable_all(bpy.types.Operator):
'''This operator disable all selected sequence'''
bl_label = "Disable All Sequences"
bl_idname = "bseq.disableall"
bl_options = {"UNDO"}

def execute(self, context):
for obj in bpy.context.scene.collection.all_objects:
if obj.BSEQ.init and obj.BSEQ.enabled:
obj.BSEQ.enabled = False
return {"FINISHED"}

class BSEQ_OT_enable_all(bpy.types.Operator):
'''This operator enable all selected sequence'''
bl_label = "Enable All Sequences"
bl_idname = "bseq.enableall"
bl_options = {"UNDO"}

def execute(self, context):
for obj in bpy.context.scene.collection.all_objects:
if obj.BSEQ.init and not obj.BSEQ.enabled:
obj.BSEQ.enabled = True
return {"FINISHED"}
>>>>>>> upstream/main
You are viewing a condensed version of this merge commit. You can view the full changes here.