d65a5a92f9
assertion when bvhtree_from_mesh_faces is called and tessfaces dont exist.
2012-01-23 20:46:38 +00:00
b64f352270
svn merge ^/trunk/blender -r43033:43062
2012-01-02 02:57:36 +00:00
ab097223d4
Fix [ #29556 ] shrinkwrap generates spikes if vertices fall exactly on the edge
...
bvhtree_ray_tri_intersection now using isect_ray_tri_epsilon_v3 with FLT_EPSILON. All devs I asked (incuding ones in physics/painting areas) were rather OK with this change, and better to do it now, with more than one month to detect regressions, if any!
2012-01-01 16:37:01 +00:00
f07df7287e
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
...
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
2011-12-04 23:13:28 +00:00
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
edec46b0a6
Merge with trunk r41625
2011-11-07 16:36:49 +00:00
7508540c53
svn merge -r41575:41602 ^/trunk/blender
2011-11-07 07:01:24 +00:00
85540d5aa7
more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.
2011-11-06 16:38:21 +00:00
ec3b0c6a96
misc macro --> bli math lib functions
2011-11-06 15:17:43 +00:00
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
fae903e263
Dynamic Paint:
...
* More code changes pointed by Brecht in codereview.
* Some user interface improvements.
* Updating brush settings now also updates canvas preview.
2011-10-28 14:46:09 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
d4541fd891
Merge with trunk r41197
2011-10-22 16:43:23 +00:00
74017cb020
header cleanup and typo's
2011-10-22 01:53:35 +00:00
4e118bb22f
svn merge ^/trunk/blender -r40890:40950
2011-10-14 01:35:20 +00:00
8be3249537
Merge with trunk r40991
2011-10-13 21:43:02 +00:00
69732dbe21
Miscellaneous cleanup, comment changes, and asserts. Should be no functional changes.
2011-10-10 14:56:09 +00:00
bc40f11093
header cleanup (no functional changes)
2011-10-10 09:38:02 +00:00
a9e34852a9
Fix for face-snapping to faces in the same mesh
2011-09-16 04:28:38 +00:00
2dc6b8f835
svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 14:34:36 +00:00
97d0846d2c
svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-24 13:03:48 +00:00
c896fcae79
Merge with trunk r37849
2011-06-27 08:11:05 +00:00
ebff5d5fb2
free_bvhtree_from_mesh was incorrectly useing sizeof() when clearing memory.
2011-06-24 05:34:03 +00:00
b937a4f5b6
Merge with trunk r37546
2011-06-16 12:00:03 +00:00
Lukas Toenne
fbd5b4eb53
Fix for edge mesh BVH: The edge distance callback for leaf nodes was calculating actual sqrt'ed distance, while needing squared distance to be compatible with bounding box checks. This also solves previous concerns about performance when using sqrt in the comparison callback.
2011-06-11 14:08:46 +00:00
3b41ab432b
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
60d81b09c6
=bmesh=
...
Implemented the solidify modifier (but
not the editmode tool, yet).
2011-04-03 00:25:01 +00:00
dd56ebe607
blenkernel: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-28 04:22:50 +00:00
Nathan Letwory
0ff06e21cd
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
Nathan Letwory
5b607701a7
doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
89c9aaaa25
remove references to BKE_utildefines where its not needed.
...
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
2011-01-07 19:18:31 +00:00
8f21a43535
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
...
no functional changes.
2011-01-07 18:36:47 +00:00
2c70b1785c
bugfix [ #24887 ] Crash on snapping verts on other object
...
now the derived mesh and the editmesh will always have matching faces.
2010-11-24 18:02:35 +00:00
337f95dfab
Bugfix #24887
...
Crash in snapping, bvh tree. Wrong check for numFaces here.
Fixed the crash by adding test for face pointer, but not sure
what the coder intended here. Needs investigation, left XXX remark.
2010-11-24 17:13:02 +00:00
4a20c386fd
bugfix [ #20768 ] Project Snap Broken
2010-11-22 14:16:11 +00:00
8268a4be71
most unused arg warnings corrected.
...
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
2010-10-16 14:32:17 +00:00
c11c196efa
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
2010-07-19 04:44:37 +00:00
1e9bf0cfdb
spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text)
2010-03-22 09:30:00 +00:00
546ca400d8
removed unused includes, except for physics and particle related files
2010-03-21 13:42:25 +00:00
71003b9bcc
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
2010-03-09 04:32:40 +00:00
081c1205a3
correct fsf address
2010-02-12 13:34:04 +00:00
abd16aac5a
ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
2009-11-29 00:53:23 +00:00
0e165c55bb
did math lib conversion, equivilent to merge with trunk/2.5 at r24464
2009-11-23 14:41:22 +00:00
6dcb4ac7a4
* Fixing various compiler warnings under scons+mingw. Mostly unused variables and functions.
...
* Added missing lib-linking code for Grease Pencil in nodetrees
* Uncommented some code for curve shapekeys
2009-11-11 09:59:51 +00:00
37e4a311b0
Math Lib
...
* Convert all code to use new functions.
* Branch maintainers may want to skip this commit, and run this
conversion script instead, if they use a lot of math functions
in new code:
http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
8f788c64db
merge with trunk/2.5 at r23876
...
[[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
