projects
/
blender-staging.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender-staging.git]
/
source
/
blender
/
blenkernel
/
BKE_blender.h
2011-11-10
Campbell Barton
svn merge -r41655:41715 ^/trunk/blender --- this...
blob
|
commitdiff
|
raw
2011-11-10
Campbell Barton
svn merge -r41650:41655 ^/trunk/blender --- cycles...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-10
Campbell Barton
svn merge -r41649:41650 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-10
Campbell Barton
svn merge -r41638:41648 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-08
Brecht Van Lommel
Cycles Merge
blob
|
commitdiff
|
raw
|
diff to current
2011-11-08
Brecht Van Lommel
Cycles: svn merge -r41627:41650 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-08
Campbell Barton
svn merge ^/trunk/blender -r41602:41638 .
blob
|
commitdiff
|
raw
|
diff to current
2011-11-07
Brecht Van Lommel
Textures/Shaders: extend TexMapping to include projecti...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-07
Brecht Van Lommel
Cycles: svn merge -r41531:41613 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-07
Campbell Barton
svn merge -r41575:41602 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-06
Campbell Barton
svn merge ^/trunk/blender -r41503:41575
blob
|
commitdiff
|
raw
|
diff to current
2011-11-05
Campbell Barton
use (const char*) rather than (char*) where possible.
blob
|
commitdiff
|
raw
|
diff to current
2011-11-04
Brecht Van Lommel
Cycles: svn merge -r41467:41531 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-04
Sergey Sharybin
Fix #28865: Draw_bounds_type does not display Polyhedro...
blob
|
commitdiff
|
raw
|
diff to current
2011-11-03
Campbell Barton
svn merge -r41480:41503 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-02
Campbell Barton
svn merge -r41458:41480 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-02
Campbell Barton
svn merge ^/trunk/blender/ -r41453:41458
blob
|
commitdiff
|
raw
|
diff to current
2011-11-01
Campbell Barton
svn merge -r41431:41453 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-01
Campbell Barton
svn merge -r41422:41431 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-11-01
Campbell Barton
svn merge -r41420:41422 ^/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-30
Campbell Barton
svn merge -r41335:41371
blob
|
commitdiff
|
raw
|
diff to current
2011-10-28
Campbell Barton
svn merge -r41329:41335 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-28
Campbell Barton
svn merge -r41310:41329 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-27
Campbell Barton
svn merge -r41287:41310 ^/trunk/blender note, mirror...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-26
Campbell Barton
svn merge -r41266:41287 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41230:41266
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Brecht Van Lommel
Cycles: svn merge -r41225:41232 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41227:41230 . --accept...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Brecht Van Lommel
Cycles: svn merge -r41205:41225 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41226:41227 .
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41200:41226 .
blob
|
commitdiff
|
raw
|
diff to current
2011-10-24
Campbell Barton
svn merge ^/trunk/blender -r41175:41200 --- will...
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-24
Campbell Barton
svn merge ^/trunk/blender -r41100:41150
blob
|
commitdiff
|
raw
|
diff to current
2011-10-23
Campbell Barton
remove $Id: tags after discussion on the mailign list...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-23
Campbell Barton
committing 'a' to merge into the tag
blob
|
commitdiff
|
raw
|
diff to current
2011-10-21
Brecht Van Lommel
Cycles: svn merge -r40934:41157 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-10-20
Thomas Dinges
Version cycle:
blob
|
commitdiff
|
raw
|
diff to current
2011-10-18
Campbell Barton
svn merge ^/trunk/blender -r41075:41099
blob
|
commitdiff
|
raw
|
diff to current
2011-10-17
Thomas Dinges
BLENDER_VERSION_CYCLE:
blob
|
commitdiff
|
raw
|
diff to current
2011-10-17
Ton Roosendaal
Blender 2.60 release commit!
blob
|
commitdiff
|
raw
|
diff to current
2011-10-17
Campbell Barton
svn merge ^/trunk/blender -r41005:41075
blob
|
commitdiff
|
raw
|
diff to current
2011-10-15
Brecht Van Lommel
Cycles:
blob
|
commitdiff
|
raw
|
diff to current
2011-10-14
Andrew Wiggin
svn merge ^/trunk/blender -r40997:41005 (to integrate...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-14
Campbell Barton
svn merge ^/trunk/blender -r40950:40997, bmesh is in...
blob
|
commitdiff
|
raw
|
diff to current
2011-10-14
Campbell Barton
svn merge ^/trunk/blender -r40890:40950
blob
|
commitdiff
|
raw
|
diff to current
2011-10-13
Campbell Barton
svn merge ^/trunk/blender -r40872:40890
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-06
Campbell Barton
svn merge ^/trunk/blender -r40644:40720
blob
|
commitdiff
|
raw
|
diff to current
2011-10-02
Thomas Dinges
* 2.60 release cycle, moving on to bcon4, only bugfixes!
blob
|
commitdiff
|
raw
|
diff to current
2011-09-30
Sergey Sharybin
Bump maps flip: now white means salience, black means...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-28
Campbell Barton
svn merge ^/trunk/blender -r40587:40643
blob
|
commitdiff
|
raw
|
diff to current
2011-09-27
Campbell Barton
svn merge ^/trunk/blender -r40511:40587
blob
|
commitdiff
|
raw
|
diff to current
2011-09-24
Campbell Barton
svn merge ^/trunk/blender -r40498:40511
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40491:40498
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40432:40491
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40431:40432
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40405:40431
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40395:40405
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40394:40395
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40390:40394
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40389:r40390
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40382:r40389
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40381:40382
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40379:40381
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40372:40379
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Campbell Barton
svn merge ^/trunk/blender -r40371:40372
blob
|
commitdiff
|
raw
|
diff to current
2011-09-22
Campbell Barton
svn merge ^/trunk/blender -r40370:40371
blob
|
commitdiff
|
raw
|
diff to current
2011-09-22
Campbell Barton
svn merge ^/trunk/blender -r40368:40370
blob
|
commitdiff
|
raw
|
diff to current
2011-09-22
Campbell Barton
svn merge ^/trunk/blender -r40367:40368 --- raddish...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-21
Campbell Barton
svn merge -r40295:40367 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Brecht Van Lommel
Cycles: svn merge -r40358:40411 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Thomas Dinges
We are now in Bcon 3 - Beta.
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Sergey Sharybin
Merging r40366 through r40392 from trunk into soc-2011...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-19
Dalai Felinto
TexFace to Material Settings big patch
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-17
Campbell Barton
svn merge -r40279:40295 ^/trunk/blender
blob
|
commitdiff
|
raw
|
diff to current
2011-09-17
Campbell Barton
svn merge -r40166:40279 ^/trunk/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 -r39900:40000 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-12
Campbell Barton
svn merge -rr40148:40166 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Campbell Barton
svn merge -r40140:r40148 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Campbell Barton
svn merge -r40124:40140 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-11
Campbell Barton
svn merge -r40117:40124 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-11
Campbell Barton
svn merge -r40104:40117 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-10
Campbell Barton
svn merge -r40075:40104 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-09
Campbell Barton
svn merge -r40051:40075 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-09
Campbell Barton
svn merge -r40034:40051 https://svn.blender.org/svnroot...
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-08
Campbell Barton
svn merge -r39990:39991 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-08
Campbell Barton
svn merge -r39990:39991 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-08
Campbell Barton
svn merge -r39986:39990 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
Campbell Barton
svn merge -r39951:39986 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Campbell Barton
svn merge -r39890:39951 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Campbell Barton
svn merge -r39890:39889 source/blender/editors/object...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Campbell Barton
svn merge -r39930:39947 https://svn.blender.org/svnroot...
blob
|
commitdiff
|
raw
|
diff to current
next