Andrew Wiggin
4e86b48cbd
Rename DM *_face_* funcs to be either *_tessface_* or *_poly_* to avoid confusion
...
This is the first step in a few changes to cleanup confusing/missing DM funcs
2011-11-29 05:09:54 +00:00
Campbell Barton
f2551ff799
- add BM_NGON_STACK_SIZE define to use wherever ngon stack arrays are used.
...
- renamed BM_Compute_Face_Center() to BM_Compute_Face_CenterBounds() and added BM_Compute_Face_CenterMean() since there was code inline to find the mean center in transform.
2011-11-29 04:11:17 +00:00
Campbell Barton
52558fbe2e
basic bevel modifier working again in bmesh, closely matches the edge split modifier since it calls out to the bevel operator.
...
- edge angles are ok
- width is interpreted as percent
added BMESH_TODO comments with details about what needs working on.
2011-11-28 04:19:44 +00:00
Campbell Barton
9776f56a39
change edge split modifier to loop over all edges and compare the face angles, rather then looping over all faces and looking at every faces-edges-fance which would compare faces twice.
2011-11-28 03:41:14 +00:00
Campbell Barton
2022580ce1
svn merge ^/trunk/blender -r42194:42197
2011-11-27 23:56:29 +00:00
Campbell Barton
a2e1060862
quiet some warnings and logical errors.
...
- curve map insert point had a nested loop which used the same value to index different arrays.
- dynamic paint used ternary operator where both outcomes were the same.
2011-11-27 23:41:01 +00:00
Campbell Barton
3b5bcab09c
svn merge ^/trunk/blender -r42139:42172
2011-11-26 16:29:14 +00:00
Campbell Barton
6736576f6d
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
2011-11-26 04:07:38 +00:00
Campbell Barton
f28fd56f8f
svn merge ^/trunk/blender -r42095:42116
2011-11-24 05:33:22 +00:00
Brecht Van Lommel
2345efc6c5
Patch #29336 : renaming UV (Texture) Layer to UV Map in the user interface,
...
by Gaia Clary.
Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.
The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
Campbell Barton
74c6c91ba6
svn merge ^/trunk/blender -r42080:42095
2011-11-23 17:14:27 +00:00
Bastien Montagne
8d5d87c447
Fixed some glitches with WeightVG modifiers:
...
* Added some RNA tooltips, now that they are supported by dropdown lists.
* Fixed some RNA num properties UI steps.
* Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
Campbell Barton
e7cfaf1b5f
ocean sim now works with bmesh
2011-11-22 19:43:09 +00:00
Campbell Barton
f461800435
svn merge ^/trunk/blender -r42077:42080
2011-11-22 19:04:40 +00:00
Campbell Barton
055ddbc22d
looking at CustomData_add_* functions - best the return valye is checked.
2011-11-22 19:01:52 +00:00
Campbell Barton
761ebc7b59
more minor edits to ocean sim code
2011-11-22 18:51:01 +00:00
Campbell Barton
ac814498a2
svn merge ^/trunk/blender -r42069:42076
2011-11-22 18:15:08 +00:00
Campbell Barton
b78701f6fe
ocean sim
...
- UV's were not being calculated if there were too many VColor layers.
- precalc (omd->size * omd->spatial_size) was being called in a loop.
- use vector functions to avoid pointer indrections on each access which the compiler wont optimize - eg: och->ibufs_disp[f]->rect_float[4*(res_x*j + i) + 1]
- dont call abs() on ints (converts to double and back to int in this case).
also unrelated render buttons change. move saving options directly under the file path since these were easy to confuse with image format options like zbuf, ycc, preview.. etc.
2011-11-22 18:03:33 +00:00
Campbell Barton
c6391e8d23
svn merge ^/trunk/blender -r42053:42069
2011-11-22 15:33:44 +00:00
Campbell Barton
36fa74b50e
remove unnecessary switch() statement from ocean sim loop.
2011-11-22 15:10:08 +00:00
Campbell Barton
f9e00b5c99
svn merge ^/trunk/blender -r42009:42053
2011-11-22 11:51:42 +00:00
Campbell Barton
fd742566a6
- use cache_ as a prefix for new modifiers.
...
- some comments to recent image changes.
2011-11-22 10:04:28 +00:00
d4f27b7bf0
Yet another fix for crashes when drawing empty base mesh with constructive modifier. This crashed with ocean modifier ( #29241 ). The previous fix was to avoid drawing mapped faces altogether for empty edit mesh, but that also disables the actual derived mesh display ( #29346 ).
...
The real reason for this crash is that ocean modifier (in generative setting) does not properly set the derived mesh face ORIGINDEX data to ORIGINDEX_NONE. With this the previous fixes are not necessary.
2011-11-21 11:46:05 +00:00
Campbell Barton
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
Campbell Barton
f1eb66aa68
share code for fluidsim, ocean & dynamic paint file paths.
...
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
2011-11-20 14:38:11 +00:00
17b113c784
Option to rename the vertex color data layer used by Ocean modifier for foam. The modifier outputs foam values to both textures and a (temporary) vertex data layer. This layer was unnamed before, which makes it impossible to access in shader nodes. Now the user can input a custom name in the modifier panel, then use that same name in a shader input node to access foam values.
...
http://www.pasteall.org/pic/21120
2011-11-20 14:16:41 +00:00
Campbell Barton
3c8d86e117
svn merge ^/trunk/blender -r41961:41998
2011-11-20 01:14:33 +00:00
Bastien Montagne
807a76d943
Fixing compile breakage (was missing an #include "BKE_camera.h" in UVProject modifier code file…).
2011-11-19 20:40:46 +00:00
Brecht Van Lommel
5d2a155f2b
Camera: some more refactoring, mostly in the function that computes the camera
...
border, now we just get the border coordinates from comparing the viewport and
camera viewplanes.
2011-11-19 18:35:42 +00:00
Campbell Barton
9d05ccf9e8
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
2011-11-16 19:06:38 +00:00
Campbell Barton
707fcc42a3
replace macros with math functions
2011-11-16 17:37:20 +00:00
Campbell Barton
9087cb91d4
quiet compiler warnings for BLI_array defines, split BLI_array_append into BLI_array_append / BLI_array_append_r, the latter returning the new array location.
2011-11-16 17:09:41 +00:00
Campbell Barton
0c017bf146
tag index arrays as dirty when any element is removed, also check validity on operator init/exit (check was missed in some cases before)
2011-11-16 14:36:23 +00:00
391f40e8c9
Default cache file paths for ocean and fluidsim modifiers are now "<temp folder>/ocean_cache/" and "<temp_folder>/fluid_cache/" when the file is not saved yet at the time the modifiers are created.
...
If it has been saved, the file paths are relative to the .blend: "//ocean_cache/" and "//fluid_cache/".
This should at least partially fix bug #29273 . Particle external point caches are not changed.
http://projects.blender.org/tracker/?func=detail&atid=498&aid=29273&group_id=9
2011-11-16 12:43:12 +00:00
Campbell Barton
da849bbfc0
prepare for flagging the bmesh has having invalid index values, so we can skip looping over all elements if its already valid.
...
- went over every BM_SetIndex call and added comments about its use, if its setting dirty values or correct ones.
- replace loops over all elements _just_ to set index values, with a new function, BM_ElemIndex_Ensure(...), this will eventually only initialize values when they are dirty.
2011-11-16 12:38:40 +00:00
Campbell Barton
c00c0134e0
svn merge -r41847:41899 ^/trunk/blender
2011-11-16 03:10:15 +00:00
Campbell Barton
502081879b
remove unused OceanModifierData member & use smaller flags where possible
2011-11-15 03:48:25 +00:00
Campbell Barton
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
Campbell Barton
e59ab6486f
svn merge -r41751:41779 ^/trunk/blender
2011-11-15 02:05:32 +00:00
Campbell Barton
49ccf975f2
minor cleanup
...
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
2011-11-14 16:05:44 +00:00
Campbell Barton
dfd20bb888
remove double promotions and some formatting edits (tabs & spaces mixed)
2011-11-13 16:10:01 +00:00
Bastien Montagne
2af9b9476e
Make Ocean modifier compile again! Also removed it’s $ID$ heading stuff.
2011-11-13 15:41:40 +00:00
Campbell Barton
8b32341775
ensure that the path and directory are joined correctly for ocean cache (assumed path ended with a '/')
2011-11-13 15:17:24 +00:00
Andrew Wiggin
2266c7fc1c
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
11c83d8432
Ocean Sim modifier patch
...
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
Campbell Barton
e84c0980a3
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
Campbell Barton
eadb192986
svn merge -r41723:41751 ^/trunk/blender
2011-11-11 06:37:29 +00:00
Campbell Barton
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
Andrew Wiggin
da93c1fde2
Fix [ #29214 ] build modifier calculates wrong fraction of faces/verts/edges to draw
2011-11-10 13:28:58 +00:00
Campbell Barton
dfc30d1229
quiet some warnings from recent merge
2011-11-10 12:28:26 +00:00
Andrew Wiggin
Campbell Barton
Brecht Van Lommel
Bastien Montagne
Lukas Toenne