projects
/
blender.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
OSX: set ffmpeg back in darwin-config according librenaming
[blender.git]
/
build_files
/
scons
/
config
/
darwin-config.py
2012-02-24
Jens Verwiebe
OSX: set ffmpeg back in darwin-config according librenaming
blob
|
commitdiff
|
raw
2012-02-18
Sergey Sharybin
Merging r44140 through r44226 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-17
Campbell Barton
svn merge ^/trunk/blender -r44136:44189
blob
|
commitdiff
|
raw
|
diff to current
2012-02-17
Jens Verwiebe
OSX: since XCode 4.3 the developer directory is inside...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-15
Campbell Barton
svn merge ^/trunk/blender -r44076:44118
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Sergey Sharybin
Merging r44070 through r44108 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Jens Verwiebe
OSX: to make transition for mediaimports to ffmpeg...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-30
Sergey Sharybin
Camera tracking: improvements of track preview widget
blob
|
commitdiff
|
raw
|
diff to current
2011-12-14
Campbell Barton
svn merge ^/trunk/blender -r42586:42617
blob
|
commitdiff
|
raw
|
diff to current
2011-12-13
Sergey Sharybin
Merging r42533 through r42601 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-12
Jens Verwiebe
OSX: proper scons config and linking weak for jackOSX...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-02
Sergey Sharybin
Merging r42193 through r42349 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-02
Campbell Barton
svn merge ^/trunk/blender -r42303:42329
blob
|
commitdiff
|
raw
|
diff to current
2011-12-01
Brecht Van Lommel
Cycles
blob
|
commitdiff
|
raw
|
diff to current
2011-11-22
Sergey Sharybin
Merging r41937 through r42061 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-20
Campbell Barton
svn merge ^/trunk/blender -r41961:41998
blob
|
commitdiff
|
raw
|
diff to current
2011-11-19
Campbell Barton
hide overly picky warnings from 'pylint' for pep8 scrip...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-16
Sergey Sharybin
Merged trunk up to rev41928
blob
|
commitdiff
|
raw
|
diff to current
2011-11-15
Campbell Barton
svn merge -r41779:41847 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-13
Jens Verwiebe
Scons_buildsystem: add WITH_BF_OCEANSIM = True to all...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-10
Campbell Barton
svn merge -r41655:41715 ^/trunk/blender --- this...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-09
Miika Hamalainen
Merge with trunk r41701
soc-2011-carrot
blob
|
commitdiff
|
raw
|
diff to current
2011-11-09
Brecht Van Lommel
Cycles: mac + scons build should not work.
blob
|
commitdiff
|
raw
|
diff to current
2011-11-08
Thomas Dinges
Cycles:
blob
|
commitdiff
|
raw
|
diff to current
2011-11-04
Sergey Sharybin
Merging r41246 through r41535 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-02
Brecht Van Lommel
Cycles: svn merge -r41266:41467 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-01
Campbell Barton
svn merge -r41371:41420 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-31
Miika Hamalainen
Merge with trunk r41411
blob
|
commitdiff
|
raw
|
diff to current
2011-10-31
Campbell Barton
Correction to own commit r41169
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41150:41175
blob
|
commitdiff
|
raw
|
diff to current
2011-10-22
Miika Hamalainen
Merge with trunk r41197
blob
|
commitdiff
|
raw
|
diff to current
2011-10-21
Brecht Van Lommel
Cycles: svn merge -r41157:41182 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-21
Sergey Sharybin
Merging r41158 through r41175 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-21
Campbell Barton
cleanup scons build flags, many duplicates because...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-11
Brecht Van Lommel
Cycles: svn merge -r40411:40934 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-09
Campbell Barton
svn merge ^/trunk/blender -r40720:40872
blob
|
commitdiff
|
raw
|
diff to current
2011-10-07
Sergey Sharybin
Merging r40653 through r40847 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-06
Campbell Barton
svn merge ^/trunk/blender -r40644:40720
blob
|
commitdiff
|
raw
|
diff to current
2011-10-04
Miika Hamalainen
Merge with trunk r40782
blob
|
commitdiff
|
raw
|
diff to current
2011-10-02
Joerg Mueller
* Removing libsamplerate from build systems
blob
|
commitdiff
|
raw
|
diff to current
2011-09-29
Jens Verwiebe
OSX: another non-ASCII char, sorry
blob
|
commitdiff
|
raw
|
diff to current
2011-09-28
Jens Verwiebe
OSX: Give clear commenting and more up-to-date defaults
blob
|
commitdiff
|
raw
|
diff to current
2011-09-28
Jens Verwiebe
OSX: change omp default True gor gcc-4.6.1 only atm
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Miika Hamalainen
Merge with trunk r40409
blob
|
commitdiff
|
raw
|
diff to current
2011-09-17
Brecht Van Lommel
Cycles: svn merge -r39870:r40266 https://svn.blender...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-15
Sergey Sharybin
svn merge -r39834:40222 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-13
Campbell Barton
svn merge -r40000:40179 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-13
Campbell Barton
svn merge -r39800:39900 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-13
Campbell Barton
svn merge -r39558:39800 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-09
Benoit Bolsee
svn merge -r 39975:40061 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-08
Sergey Sharybin
Merging r39998 through r40043 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-08
Campbell Barton
svn merge -r39991:40034 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-07
Benoit Bolsee
svn merge -r 37306:39975 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-07
Jens Verwiebe
OSX: revert default compile to i386, for it breakes...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-07
Sergey Sharybin
Merging r39717 through r39983 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-05
Miika Hamalainen
Merge with trunk r39928
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Brecht Van Lommel
Cycles: svn merge -r39669:39870 https://svn.blender...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-01
Bastien Montagne
Merging r39652 through r39842 from trunk into vgroup_mo...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-01
Xiao Xiangquan
merge with trunk r39834
blob
|
commitdiff
|
raw
|
diff to current
2011-09-01
Campbell Barton
svn merge -r39792:39829 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-31
Jens Verwiebe
OSX/scons: fix compile with static python, my patch...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-30
Jens Verwiebe
OSX: additionally choice to link against python-framewo...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-30
Joerg Mueller
* Merge trunk up to r39790.
soc-2011-pepper
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Campbell Barton
svn merge -r39664:39762 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-28
Miika Hamalainen
Merge with trunk r39750
blob
|
commitdiff
|
raw
|
diff to current
2011-08-28
Joerg Mueller
* Removing mocap GSoC (is an addon already).
blob
|
commitdiff
|
raw
|
diff to current
2011-08-26
Sergey Sharybin
Revert back to FFmpeg from lib/<platform>/ffmpeg
blob
|
commitdiff
|
raw
|
diff to current
2011-08-26
Sergey Sharybin
Merging r39634 through r39716 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Jens Verwiebe
OSX/scons: don“t link to system stubs with 10.7 sdk
blob
|
commitdiff
|
raw
|
diff to current
2011-08-22
Joerg Mueller
Merging trunk up to r39637.
blob
|
commitdiff
|
raw
|
diff to current
2011-08-22
Sergey Sharybin
Merging r39631 through r39633 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-22
Sergey Sharybin
Merging trunk into soc-2011-tomato.
blob
|
commitdiff
|
raw
|
diff to current
2011-08-21
Miika Hamalainen
Merge with trunk r39589
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Sergey Sharybin
Merging r39478 through r39542 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-17
Bastien Montagne
Merging r39199 through r39485 from trunk into vgroup_mo...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-17
Sergey Sharybin
Merging r39435 through r39477 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Brecht Van Lommel
Cycles: svn merge -r39132:39457 https://svn.blender...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Joerg Mueller
Merging trunk up to r39447.
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Sergey Sharybin
Merging r39397 through r39434 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Campbell Barton
svn merge -r39286:39385 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Sergey Sharybin
Merging r39391 through r39396 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Sergey Sharybin
Merging r39330 through r39390 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-12
Jason Hays
Merged 39257-39338
blob
|
commitdiff
|
raw
|
diff to current
2011-08-12
Sergey Sharybin
Merging r39312 through r39329 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Sergey Sharybin
Merging r39251 through r39311 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Sergey Sharybin
Commiting patch from jensverwiebe for NDOF support...
v2.59
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Campbell Barton
svn merge -r39286:39298 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Campbell Barton
merge outliner refactor so we dont have to keep outline...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Campbell Barton
svn merge -r39145:39286 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-11
Campbell Barton
svn merge -r39057:39286 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-10
Xiao Xiangquan
merge with trunk r39216
blob
|
commitdiff
|
raw
|
diff to current
2011-08-10
Sergey Sharybin
Merging r39191 through r39250 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Bastien Montagne
Merging r38818 through r39198 from trunk into vgroup_mo...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Sergey Sharybin
Merging r39179 through r39190 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Jason Hays
Merged 38822-39182
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Sergey Sharybin
Camera tracking integration
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Sergey Sharybin
Camera tracking integration
blob
|
commitdiff
|
raw
|
diff to current
2011-08-08
Sergey Sharybin
Merging r39135 through r39172 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-07
Thomas Dinges
Mac Compile fix for ndof, by jensverwiebe. Thanks!
blob
|
commitdiff
|
raw
|
diff to current
2011-08-07
Campbell Barton
scons patch from jensverwiebe
blob
|
commitdiff
|
raw
|
diff to current
next