Merge pull request #3870 from ferdnyc/initfiles

Add __init__.py files to all Python source file paths (including all parent dirs), rename Blender scripts
OpenShot · Dec 25, 2020 · 09c30dc · 09c30dc
2 parents d174852 + 0702fe0
commit 09c30dc
Show file tree

Hide file tree

Showing 35 changed files with 2 additions and 2 deletions.
diff --git a/src/blender/scripts/blinds.py → src/blender/scripts/blinds.py.in b/src/blender/scripts/blinds.py → src/blender/scripts/blinds.py.in
diff --git a/src/blender/scripts/blur.py → src/blender/scripts/blur.py.in b/src/blender/scripts/blur.py → src/blender/scripts/blur.py.in
diff --git a/src/blender/scripts/colors.py → src/blender/scripts/colors.py.in b/src/blender/scripts/colors.py → src/blender/scripts/colors.py.in
diff --git a/src/blender/scripts/dissolve.py → src/blender/scripts/dissolve.py.in b/src/blender/scripts/dissolve.py → src/blender/scripts/dissolve.py.in
diff --git a/src/blender/scripts/earth.py → src/blender/scripts/earth.py.in b/src/blender/scripts/earth.py → src/blender/scripts/earth.py.in
diff --git a/src/blender/scripts/explode.py → src/blender/scripts/explode.py.in b/src/blender/scripts/explode.py → src/blender/scripts/explode.py.in
diff --git a/src/blender/scripts/fly_by_1.py → src/blender/scripts/fly_by_1.py.in b/src/blender/scripts/fly_by_1.py → src/blender/scripts/fly_by_1.py.in
diff --git a/src/blender/scripts/fly_by_two_titles.py → src/blender/scripts/fly_by_two_titles.py.in b/src/blender/scripts/fly_by_two_titles.py → src/blender/scripts/fly_by_two_titles.py.in
diff --git a/src/blender/scripts/glare.py → src/blender/scripts/glare.py.in b/src/blender/scripts/glare.py → src/blender/scripts/glare.py.in
diff --git a/src/blender/scripts/glass_slider.py → src/blender/scripts/glass_slider.py.in b/src/blender/scripts/glass_slider.py → src/blender/scripts/glass_slider.py.in
diff --git a/src/blender/scripts/gpu_enable.py → src/blender/scripts/gpu_enable.py.in b/src/blender/scripts/gpu_enable.py → src/blender/scripts/gpu_enable.py.in
diff --git a/src/blender/scripts/lens_flare.py → src/blender/scripts/lens_flare.py.in b/src/blender/scripts/lens_flare.py → src/blender/scripts/lens_flare.py.in
diff --git a/src/blender/scripts/magic_wand.py → src/blender/scripts/magic_wand.py.in b/src/blender/scripts/magic_wand.py → src/blender/scripts/magic_wand.py.in
diff --git a/src/blender/scripts/neon_curves.py → src/blender/scripts/neon_curves.py.in b/src/blender/scripts/neon_curves.py → src/blender/scripts/neon_curves.py.in
diff --git a/src/blender/scripts/picture_frames_4.py → src/blender/scripts/picture_frames_4.py.in b/src/blender/scripts/picture_frames_4.py → src/blender/scripts/picture_frames_4.py.in
diff --git a/src/blender/scripts/rotate_360.py → src/blender/scripts/rotate_360.py.in b/src/blender/scripts/rotate_360.py → src/blender/scripts/rotate_360.py.in
diff --git a/src/blender/scripts/slide_left_to_right.py → ...blender/scripts/slide_left_to_right.py.in b/src/blender/scripts/slide_left_to_right.py → ...blender/scripts/slide_left_to_right.py.in
diff --git a/src/blender/scripts/snow.py → src/blender/scripts/snow.py.in b/src/blender/scripts/snow.py → src/blender/scripts/snow.py.in
diff --git a/src/blender/scripts/spacemovie_intro.py → src/blender/scripts/spacemovie_intro.py.in b/src/blender/scripts/spacemovie_intro.py → src/blender/scripts/spacemovie_intro.py.in
diff --git a/src/blender/scripts/wireframe_text.py → src/blender/scripts/wireframe_text.py.in b/src/blender/scripts/wireframe_text.py → src/blender/scripts/wireframe_text.py.in
diff --git a/src/blender/scripts/zoom_clapboard.py → src/blender/scripts/zoom_clapboard.py.in b/src/blender/scripts/zoom_clapboard.py → src/blender/scripts/zoom_clapboard.py.in
diff --git a/src/classes/__init__.py b/src/classes/__init__.py
diff --git a/src/classes/exporters/__init__.py b/src/classes/exporters/__init__.py
diff --git a/src/classes/importers/__init__.py b/src/classes/importers/__init__.py
diff --git a/src/classes/legacy/__init__.py b/src/classes/legacy/__init__.py
diff --git a/src/classes/legacy/openshot/__init__.py b/src/classes/legacy/openshot/__init__.py
diff --git a/src/classes/legacy/openshot/classes/__init__.py b/src/classes/legacy/openshot/classes/__init__.py
diff --git a/src/emojis/__init__.py b/src/emojis/__init__.py
diff --git a/src/language/__init__.py b/src/language/__init__.py
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
diff --git a/src/windows/__init__.py b/src/windows/__init__.py
diff --git a/src/windows/models/__init__.py b/src/windows/models/__init__.py
diff --git a/src/windows/views/__init__.py b/src/windows/views/__init__.py
diff --git a/src/windows/views/blender_listview.py b/src/windows/views/blender_listview.py
@@ -558,7 +558,7 @@ def inject_params(self, source_path, out_path, frame=None):
         s = settings.get_settings()
         gpu_code_body = None
         if s.get("blender_gpu_enabled"):
-            gpu_enable_py = os.path.join(info.PATH, "blender", "scripts", "gpu_enable.py")
+            gpu_enable_py = os.path.join(info.PATH, "blender", "scripts", "gpu_enable.py.in")
             try:
                 with open(gpu_enable_py, 'r') as f:
                     gpu_code_body = f.read()
@@ -612,7 +612,7 @@ def Render(self, frame=None):
             info.PATH, "blender", "blend", self.selected_template)
         source_script = os.path.join(
             info.PATH, "blender", "scripts",
-            self.selected_template.replace(".blend", ".py"))
+            self.selected_template.replace(".blend", ".py.in"))
         target_script = os.path.join(
             info.BLENDER_PATH, self.unique_folder_name,
             self.selected_template.replace(".blend", ".py"))

diff --git a/src/windows/views/webview_backend/__init__.py b/src/windows/views/webview_backend/__init__.py