blender.org
code.blender.org
User:Brecht
for
User:Brecht
User page
Discussion
Links
Contributions
View source
History
From BlenderWiki
Jump to:
navigation
,
search
Note: This is an archived version of the Blender Developer Wiki. The current and active wiki is available on
wiki.blender.org
.
You can view and copy the source of this page:
=== Work === * [[Org:Institute|Blender Institute]] * [[Dev:2.6/Source/Render/Cycles|Cycles Render]] * [[User:Brecht/RenderIdeas|Render Ideas]] * [[User:Brecht/RenderDesign|Render Design]] * [[User:Brecht/SculptPerf|Sculpt Performance]] * [[BlenderDev/Blender2.5|Blender 2.5]] * [[BlenderDev/UvUnwrapping|UV Unwrapping]] === Git === Using git svn to do local commits & branches. The reason I'm not cloning from the gitorious mirror is to be able to do commits to svn. <source lang="bash"> # svn checkout git svn clone https://svn.blender.org/svnroot/bf-blender/trunk/blender # svn update, commit (must be in master branch to do this) git svn rebase git svn dcommit </source> I have bash configured to show the git branch in terminal, to avoid the (for me) very common mistake of committing, merging or branching in the wrong branch. <source lang="bash"> __git_ps1 () { local b="$(git symbolic-ref HEAD 2>/dev/null)"; if [ -n "$b" ]; then printf "%s " "${b##refs/heads/}"; fi } PS1="\u@\h \[\\033[1;90m\]\$(__git_ps1)\[\\033[0m\]\W\\$ " </source> My workflow is to keep the master branch clean and only containing extra commits that can be committed to svn, never any work in progress stuff. For simple bug fixes I commit to master directly, for bigger changes I create branches which are then merged to master later. === Vim === Scripts: * [http://www.vim.org/scripts/script.php?script_id=90 subversion/git integration]: VCSVimDiff is incredibly useful * [http://www.vim.org/scripts/script.php?script_id=102 directory diff]: for big branch reviews/merging * [http://www.vim.org/scripts/script.php?script_id=2184 open file:line]: for build errors Some useful things in ~/.vimrc <source lang="vim"> set incsearch set hls syntax on set ts=4 set autoindent set smartindent set ruler set history=50 set shiftwidth=4 set title set mouse=a if has("autocmd") " Restore cursor position au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|else|exe "norm $"|endif|endif endif au BufNewFile,BufRead *.cl set filetype=c au BufNewFile,BufRead *.osl set filetype=c let g:DirDiffIgnore = "Id,Revision" let g:DirDiffExcludes = "CVS,.svn,.git" </source> === Bash === Some aliases for quick cmake build from any source directory and running blender. <source lang="bash"> function cmake_make_any_dir() { local prevdir=$(pwd); while [ ! -f ../$1/CMakeCache.txt ]; do cd ../ done cd ../$1; make -j4 $2; cd $prevdir; } alias mk="cmake_make_any_dir build" alias mki="cmake_make_any_dir build install" alias mkd="cmake_make_any_dir debug" alias mkdi="cmake_make_any_dir debug install" alias bl="../build/bin/blender.app/Contents/MacOS/blender" alias gbl="gdb --args ../build/bin/blender.app/Contents/MacOS/blender" alias dbl="gdb --args ../debug/bin/blender.app/Contents/MacOS/blender" </source>
Return to
User:Brecht
.
User:Brecht
Unversioned
Main Page
Blender Development
Blender 2.6
User Manual
Tutorials
Books
Scripts
2.72 Python API
(external link)
Blender Development
Blender 2.5
2.59 Python API
(external link)
Blender Development
Blender 2.4
User Manual
Tutorials
Books
Scripts
2.49 Python API
(external link)
Blender Development