Git merge -squash # this will create a single change set from multiple commits coming from Recommended software Git config pull.rebase true # converts pull to do, essentially, fetch&rebaseĪlso, make more meaningful commits(one commit per feature) the easy way: Git config merge.ff only # this one rejects merges that would result in merge commit Git - we try to avoid merge commits, easiest way to do it: editorconfig automatically also, Tortoise Merge has a checkbox 'Enable EditorConfig', for Visual Studio there's EditorConfig extension P圜harm(recommended!) default setting are fine and seems that it also picks up. gitconfig in the root of the project - please set you editor to use it(for most simplicity). Git submodule update -init -f -recursive Developing Coding ConventionsĪt minimum it's 4 spaces for indentation, sources are utf-8, there's.
Once SSH keys are installed update/checkout submodules for active branch You will need to create and install SSH keys Image Processing components and miscellaneous of them are included via SSH protocol. There is ThirdParty repository included to the project as a submodule. Visual Studio does provided support for debugging Python when you attach to the running Blender process with loaded addon.
The blender code builds on the command line rather than in the solution file. sln provided is for easy editing and searching of files on Windows. Make sure it's added to the PATH environment variable
0 kommentar(er)
