Campbell Barton
02c4b6b26b
bmesh todo - subsurf UV.
2011-10-30 09:48:59 +00:00
Campbell Barton
a8df5cbc76
move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's.
...
also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
Tamito Kajiyama
1f25228857
Fix for warnings about period at the end of description strings for
...
RNA operators and properties. No functional changes were made.
2011-10-30 09:05:47 +00:00
Campbell Barton
c4fa7bf286
make_uv_vert_map() was looping over the texture face for not reason.
2011-10-30 06:53:25 +00:00
Campbell Barton
965dc3d2d0
fix for drawing error, subsurf was adding black vertex colors to its derived mesh (trunk doesn't do this).
2011-10-30 03:57:46 +00:00
Andrew Wiggin
66b14f977f
Remove an edge split workaround and replace with faster, better fix for 28669
2011-10-30 03:33:08 +00:00
Campbell Barton
8408cf3dc2
fix for memory leak when switching shape keys
2011-10-30 02:15:32 +00:00
Tamito Kajiyama
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
Campbell Barton
bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
Andrew Wiggin
e48d7f4c11
Fix for #29087 : Meshs with non-planar polys added from py scripts show boundaries between tesselated triangles of a single poly
2011-10-30 01:14:50 +00:00
Thomas Dinges
f837b46a2b
Modifier compilation tweaks (Blender conference commit)
...
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)
* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
Tamito Kajiyama
16702c1729
Merged changes in the trunk up to revision 41225.
...
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
Brecht Van Lommel
996f2cd8b2
Cycles: fix blenderplayer build error.
2011-10-29 14:24:06 +00:00
Andrew Wiggin
5e90c040d9
Fix for #29080 : vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
Campbell Barton
a7bf015f38
style edits
...
- rename var to match trunk shape key code
- reduce scope of some vars
- comment some unused vars
2011-10-29 11:23:37 +00:00
Campbell Barton
e28c2ce753
bug from revision 2!, error noticed kjym3 on IRC, buffer overrun on lbarray, was 30 but 39 items beting accessed, surprising this didnt crash earlier.
2011-10-29 11:15:12 +00:00
Campbell Barton
1fd6bc21cd
add in functionality from trunk, editing base shapekey now offsets other keys when exiting editmode.
2011-10-29 10:19:57 +00:00
Campbell Barton
1e4be0a4bf
replace BLI_strtok_r from r41337 with lighter method that doesnt alloc for template_list
2011-10-29 08:18:42 +00:00
Campbell Barton
b8afde900c
macro -> math replacements, uncomment mirror funcs.
2011-10-29 06:57:50 +00:00
Miika Hamalainen
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
Brecht Van Lommel
ed77c356fc
Fix: OpenGL renders on graphics cards which do not support non-power-of-two
...
textures were stretched and the wrong size.
2011-10-28 16:57:06 +00:00
Miika Hamalainen
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
Campbell Barton
e9429f45e5
re-enable mirroring - it was commented in a few functions.
2011-10-28 14:31:15 +00:00
Campbell Barton
a5bd610e70
uncomment shape key mirror.
2011-10-28 14:17:27 +00:00
Bastien Montagne
7627a742ab
UI list template: committing patch [ #26629 ].
...
This adds the ability (esp. for py scripts) to add some controls for each list element. See http://wiki.blender.org/index.php/User:Mont29/UI_Template_List_Enhancement for details.
2011-10-28 13:09:43 +00:00
Bastien Montagne
2ed7a66653
BLI_string: Adding the BLI_strtok_r function, which mimics stdlib strtok_r (unavailable on some systems).
...
It allows to iterate over a string, returning an new element each time, using a char as separator. See BLI_String.h's comments for more info and an example.
Needed by the UI template list patch following!
2011-10-28 13:07:11 +00:00
Campbell Barton
0701982933
svn merge -r41329:41335 ^/trunk/blender
2011-10-28 12:57:37 +00:00
Campbell Barton
0d63bb005f
replace VECCOPY and QUATCOPY with inline funcs.
2011-10-28 12:40:15 +00:00
Campbell Barton
565fcd8907
fix for error in gpu.export_shader() was missing *4 (only writing 1/4 of the colorband)
2011-10-28 08:53:00 +00:00
Campbell Barton
f5cf238884
the BMesh select mode wasnt being set on entering editmode, this made snap to selection fail.
2011-10-28 08:09:34 +00:00
Campbell Barton
243ef037c9
BMEditMesh.mirror_cdlayer wasnt being set anywhere, adding any other type of layer would break editmesh mirror editing.
2011-10-28 06:23:12 +00:00
Campbell Barton
f5d5de0d8a
fix for compiling collada by nico_ga
2011-10-28 06:12:00 +00:00
Campbell Barton
ff837cbe9b
svn merge -r41310:41329 ^/trunk/blender
2011-10-28 05:17:09 +00:00
Campbell Barton
4b635d1631
use generic path remapping when making all library data local, previously only image paths were getting corrected, now all paths will (scene image seq strips, pointcache etc)
2011-10-28 04:44:59 +00:00
Campbell Barton
3ad7445e28
fix [ #29062 ] Can not save image as external on a writable path
2011-10-28 04:05:52 +00:00
Campbell Barton
592879bfca
prefix common internal operator function names so its possible to assign them breakpoints.
2011-10-28 03:02:09 +00:00
Joshua Leung
015b7b4fa9
Renaming the extensionless "blenderbuttons" to "blender_icons.png"
2011-10-28 00:09:13 +00:00
Tamito Kajiyama
f0ca79bccb
Extended the set of conditions for feature edge selection by edge types.
...
In the Parameter Editor mode, each edge type check button in the Selection
by Edge Types has now an associated toggle button to exclude the edge type
from the feature edge selection. This allows you to select, for instance,
those edges that are silhouette lines but not external contours.
2011-10-27 20:57:14 +00:00
Andrew Wiggin
c914b11614
perf improvement for array modifiers
2011-10-27 17:39:15 +00:00
Jens Verwiebe
4ce5bb0ba2
OSX: adapt comments to new behaviour when compiling with gcc-4.6 but GHOST and QT with default compiler
2011-10-27 15:50:51 +00:00
Jens Verwiebe
7a20ced627
Fix player prototype, fix compile for OSX/XCode4.2, use always tablet enabled (test)
2011-10-27 15:46:26 +00:00
Campbell Barton
699030ceb6
use const for readonly strings and set some functions to static
2011-10-27 14:41:26 +00:00
Andrew Wiggin
626f737186
..and now fix linux build since my windows build fix had a lowercase typo
2011-10-27 12:37:14 +00:00
Andrew Wiggin
76d2e76aec
Fix windows build (__func__ macro needs definition from BLI_utildefines.h on MSVC)
2011-10-27 12:28:39 +00:00
Andrew Wiggin
dbe1c4277a
Fix "[ #29036 ] Crash on solidify" and a few misc subsurf and derived mesh bugs that were blocking correct functionality of "apply modifier to editcage" when you have a subsurf + solidify modifier on the stack
2011-10-27 12:17:02 +00:00
Campbell Barton
75e570b2b7
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
2011-10-27 09:42:03 +00:00
Campbell Barton
99075b35ed
fix [ #29044 ] applying mirror modifier causes crash; something with vertex groups?
2011-10-27 07:54:32 +00:00
Campbell Barton
6aaccb69cc
utf8 buffer wasn't being initialized in ghost_event_proc
2011-10-27 06:05:55 +00:00
Campbell Barton
f7d5cea669
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
Campbell Barton
fa6e6e7fc0
pass image description to image loading functions for more useful error than 'Unknown fileformat'.
2011-10-27 04:24:34 +00:00