Import fix #144
Merged
Import fix #144
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed all imports from absolute to relative: - instead of importing the module 'cam' now imports come from '.' the relative parent folder - importing the module into itself resulted in a circular import error, relative imports avoid this Moved Functions, refs updated: - some functions (and 2 variables) only existed on the base level of the module, in the init file, and could not otherwise be accessed, they were moved into the utils file with other similar functions - these were primarily called as update functions for Properties scattered across the addon, these have all been updated to reflect the new location and import convention opencamlib_version rename: - in 2 files there was a local variable named 'opencamlib_version' that was defined by a function called 'opencamlib_version' that returned the opencamlib_version - this seemed to confuse Blender into thinking that it was being called before it was defined, and simply changing the variable name to 'ocl_version' while keeping the function name as 'opencamlib_version' fixed the issue
Changed all imports from absolute to relative: - instead of importing the module 'cam' now imports come from '.' the relative parent folder - importing the module into itself resulted in a circular import error, relative imports avoid this Moved Functions, refs updated: - some functions (and 2 variables) only existed on the base level of the module, in the init file, and could not otherwise be accessed, they were moved into the utils file with other similar functions - these were primarily called as update functions for Properties scattered across the addon, these have all been updated to reflect the new location and import convention opencamlib_version rename: - in 2 files there was a local variable named 'opencamlib_version' that was defined by a function called 'opencamlib_version' that returned the opencamlib_version - this seemed to confuse Blender into thinking that it was being called before it was defined, and simply changing the variable name to 'ocl_version' while keeping the function name as 'opencamlib_version' fixed the issue
Changed all imports from absolute to relative: - instead of importing the module 'cam' now imports come from '.' the relative parent folder - importing the module into itself resulted in a circular import error, relative imports avoid this Moved Functions, refs updated: - some functions (and 2 variables) only existed on the base level of the module, in the init file, and could not otherwise be accessed, they were moved into the utils file with other similar functions - these were primarily called as update functions for Properties scattered across the addon, these have all been updated to reflect the new location and import convention opencamlib_version rename: - in 2 files there was a local variable named 'opencamlib_version' that was defined by a function called 'opencamlib_version' that returned the opencamlib_version - this seemed to confuse Blender into thinking that it was being called before it was defined, and simply changing the variable name to 'ocl_version' while keeping the function name as 'opencamlib_version' fixed the issue
version was previously only updated in bl_info, it has now been updated to match in the version.py file as well, which should allow it to display in the main UI.
|
Found a bug, will reopen when I've fixed it. |
While rearranging and cleaning up the utils imports in the initial 'Import fix' commit I deleted `utils.` from `bpy.utils.script_paths()` in the ops.py file. This has been fixed, and I took the opportunity to reverse the autoformat issue (changed line length from 100 to 89 between commits), and restore all the code to its previous state. I made one exception: - comments that came at the end of the line that were moved to the line above All functional code has been restored to its previous format.
While rearranging and cleaning up the utils imports in the initial 'Import fix' commit I deleted `utils.` from `bpy.utils.script_paths()` in the ops.py file. This has been fixed, and I took the opportunity to reverse the autoformat issue (changed line length from 100 to 89 between commits), and restore all the code to its previous state. I made one exception: - comments that came at the end of the line that were moved to the line above All functional code has been restored to its previous format.
While rearranging and cleaning up the utils imports in the initial 'Import fix' commit I deleted `utils.` from `bpy.utils.script_paths()` in the ops.py file. This has been fixed, and I took the opportunity to reverse the autoformat issue (changed line length from 100 to 89 between commits), and restore all the code to its previous state. I made one exception: - comments that came at the end of the line that were moved to the line above All functional code has been restored to its previous format.
While rearranging and cleaning up the utils imports in the initial 'Import fix' commit I deleted `utils.` from `bpy.utils.script_paths()` in the ops.py file. This has been fixed, and I took the opportunity to reverse the autoformat issue (changed line length from 100 to 89 between commits), and restore all the code to its previous state. I made one exception: - comments that came at the end of the line that were moved to the line above All functional code has been restored to its previous format.
|
While rearranging and cleaning up the utils imports in the initial 'Import fix' commit I deleted
All functional code has been restored to its previous format. As before the test release 1.0.7a has been updated to reflect the latest changes. |
Caught a handful more lines that needed to be reverted to clean up the diff.
Caught a handful more lines that needed to be reverted to clean up the diff.
Caught a handful more lines that needed to be reverted to clean up the diff.
Caught a handful more lines that needed to be reverted to clean up the diff.
|
Last commit was to address a handful of lines that I missed during the initial autoformat fix. I ran the test suite this time, and it seems to have generated a number of .exr files, are these intended to be uploaded, or should I delete them? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changed all imports from absolute to relative:
camnow imports come from.the relative parent folderMoved Functions, refs updated:
initfile, and could not otherwise be accessed, they were moved into theutilsfile with other similar functionsupdatefunctions for Properties scattered across the addon, these have all been updated to reflect the new location and import conventionopencamlib_version rename:
opencamlib_versionthat was defined by a function calledopencamlib_versionthat returned the opencamlib_versionocl_versionwhile keeping the function name asopencamlib_versionfixed the issueTwo Notes:
If there is an issue or a mistake, let me know and I will update/fix it.
As before I created a 1.0.7a release for easy download and testing.