Campbell Barton
7126a4699e
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
Andrew Wiggin
10d6e1e16a
Normal math improvements and vector math cleanup
2011-09-22 12:31:01 +00:00
Campbell Barton
14475d07cd
svn merge -r40295:40367 ^/trunk/blender
2011-09-21 17:15:54 +00:00
Andrew Wiggin
b602024a26
Fix rip tool issues related to BM_Make_Ngon generating a copy of an original face with a face loop cycle starting on a different loop.
2011-09-21 15:38:34 +00:00
Jason Hays
535668eef0
Merging radish branch into trunk.
...
http://wiki.blender.org/index.php?title=User:Jason_hays22/GSoC-2011
2011-09-19 16:13:34 +00:00
Jason Hays
2cbf475fb2
Merged 40338-40364
2011-09-19 15:36:30 +00:00
Campbell Barton
d78231734d
attempt to fix windows/scons issue I caused in a recent commit.
2011-09-19 15:18:58 +00:00
Campbell Barton
05683f8e52
edits to argument parsing for Euler.rotate_axis, also corrected some exception messages and minor style edits.
2011-09-19 15:13:16 +00:00
Jason Hays
94016ed285
vgroup_validmap needed to be assigned when locks were active.
2011-09-19 15:11:01 +00:00
Campbell Barton
0f5d3a3ddb
add back mathutils Matrix() * Vector(), this is row_vector multiplication.
...
some minor changes to exception messages.
2011-09-19 14:29:21 +00:00
Brecht Van Lommel
5c7b5c0b51
Blenfont: fix use incorrect clear of ascii glyph cache, leading to crash
...
when toggling use antialising user preference. Also fix some other use of
uninitialized memory found by valgrind.
2011-09-19 14:09:13 +00:00
Bastien Montagne
1794767171
/blender/makesrna: Removed final points in UI strings and messages.
...
Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
Sergey Sharybin
1d48c8db7f
Sequencer: switching to preview mode works fine again
2011-09-19 13:12:54 +00:00
Campbell Barton
9d3b1f708f
Move function out of mathutils to: BLI_math_rotation --- single_axis_angle_to_mat3(mat3, axis, angle), copied out from mathutils, axis arg is a char 'X/Y/Z' rather then a vector like axis_angle_to_mat3().
2011-09-19 13:08:01 +00:00
Bastien Montagne
f157a543c6
/blender/editors: Removed final points in UI strings and messages.
...
Plus a few cuts in very long lines…
2011-09-19 12:26:20 +00:00
Campbell Barton
9478167493
remove Buffer.list, deprecated before 2.59 release.
2011-09-19 11:55:45 +00:00
Sergey Sharybin
226ff0d4da
Curve back/front fill changes:
...
- Use enum instead of back/front flags combinations.
- This flags behaves differently for 2d/3d curves so use different enums for them.
- This commit shouldn't change existing files.
2011-09-19 09:47:58 +00:00
Sergey Sharybin
dd204cb9f7
Fix for add hook/vertex parent for meshes
...
The only way to achieve this is to re-load editMesh.
After this commit you can't iterate through vertices and insert
hooks/parents from script anymore -- this operators are now
treated as topology-changing and shouldn't be used when iterating
via geometries.
2011-09-19 08:25:31 +00:00
Campbell Barton
4e9ab6d04c
replace WORDS_BIGENDIAN with __BIG_ENDIAN__
2011-09-19 08:11:30 +00:00
Campbell Barton
83a2f02a78
cleanup endian handling
...
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
2011-09-19 08:02:17 +00:00
Campbell Barton
425a81a29b
remove WITH_* defines from image formats, instead just dont build the files at all.
2011-09-19 06:32:19 +00:00
Campbell Barton
20463cb842
svn merge ^/trunk/blender -r40311:40338
2011-09-19 05:58:52 +00:00
Campbell Barton
e197b993d3
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
Campbell Barton
8835a18e2e
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
Campbell Barton
a89b253aa6
edits to radish before merge with trunk
...
- removed some unused functions.
- renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags'
- some odd modifications were made in unrealted, commented code, copy these back from trunk.
- rename vertex_group_fix 'cp' property to 'accuracy'
- make style more consistant with trunk.
- remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
Jason Hays
73863a1da5
Split do_weight_paint_vertex() to isolate the simple case.
...
Added a tool-tip to the "fix deforms" op.
Removed code markers:
"Radish"
2011-09-18 17:10:28 +00:00
Campbell Barton
e234cb4636
add back object update function for auto-normalize too.
2011-09-18 15:20:10 +00:00
Campbell Barton
f0071799b6
allow multiple bones to be selected in weight paint mode in a less complicated way (allow Shift+RMB)
2011-09-18 15:17:16 +00:00
Campbell Barton
f4207ca417
style changes only
2011-09-18 14:54:41 +00:00
Campbell Barton
24eaf6b9b8
replace malloc of a single DeformVertex with stack variable.
2011-09-18 14:48:15 +00:00
Campbell Barton
9a0b035e1d
add back GPL2+ header to paint_utils.c, copied from editface.c since some of its functions trace back to that file from 2.4x. (imapaint_tri_weights for eg).
2011-09-18 12:16:03 +00:00
Campbell Barton
cad688a705
add old style nan GPL2+ header to sound.c since this file is from rev2 and should have had this header added.
2011-09-18 12:06:28 +00:00
Campbell Barton
82e6547a36
patch [ #28684 ] Image pack/unpack() implementation.
...
from Bill Currie (taniwha)
2011-09-18 11:47:17 +00:00
Campbell Barton
b17a62d1b3
replace strnlen with BLI_strnlen & some style changes.
2011-09-18 11:25:50 +00:00
Campbell Barton
507aa1cd22
fix for crash loading a file saved with fluidsim when blenders compiled with it disabled.
...
also remove unneed class prefix on function name for itasc.
2011-09-18 11:08:34 +00:00
Campbell Barton
53845a37d9
blf - further shrink drawing functions & some style changes.
2011-09-18 10:34:13 +00:00
Campbell Barton
249b41762a
blf code - no functional changes.
...
- remove saniy checks from blf_font.c, the callers now check instead.
- move duplicate code into defines (may move into static functions).
- move kerning checks into const values set at the start of the function, rather then checking on every character.
2011-09-18 09:48:09 +00:00
Joerg Mueller
7da6e0c82e
Fix for [ #28672 ] Blender segfault after exiting a game that was opened with autoplay on (Blender, not blenderplayer)
...
Autoplay misses uninitialisation, I'm just fixing the reported crash, it still misses all other frees, but as the program exits, we don't care?
2011-09-18 09:46:47 +00:00
Bastien Montagne
fa3082bace
Minor: Other UI strings typos and tweaks.
2011-09-18 09:38:43 +00:00
Jason Hays
a9c99f58f4
Changed the branch code markers to say "Radish" in response to a review.
...
They weren't & aren't meant to show ownership, they just help me navigate my related code.
2011-09-18 03:49:00 +00:00
Campbell Barton
6d2b98ac89
added back scene/object update function, its needed for multipaint switching.
2011-09-18 03:29:17 +00:00
Campbell Barton
8f925a39b9
rename EM_backbuf_checkAndSelectTVerts to EM_backbuf_checkAndSelectVerts_obmode until we come up with a better name this one at least says its in object mode, also there is no such thing as a TVert.
2011-09-18 02:46:03 +00:00
Campbell Barton
96ada15d79
svn merge -r40197:40311 ^/trunk/blender
2011-09-18 02:35:26 +00:00
Campbell Barton
5db33d11bd
Console Scrolling - reset while typing.
...
patch from Damir Prebeg with some edits.
Also made it so resizing the console view keeps the lower part of the text in view (could be annoying when you needed to scroll because of a resized view).
2011-09-18 01:34:53 +00:00
Jason Hays
1b5d16f1bf
I made multitude of fixes based on the comments provided online:
...
Removed the drawSelectedVerts and added drawSelectedVertices, which uses dm->foreachMappedVert.
In calc_weightpaint_vert_color():
Made the weight paint color black and return instead of input=-1
Made the pose bone selection normal when multi-paint is inactive.
Name fix for functions using mv instead of mvert.
Used vector functions provided by the math lib.
Changed some MEM_callocN references to be stacks.
Changed dm_deform_clear to use ob->derivedDeform primarily
Made the variable "float **changes" into "float (*changes)[2]"
Used CTX_data_active_object() in place of CTX_data_pointer_get_type()
Added the invert selection hotkey "Ctrl+I" to weight paint's vertex mask.
2011-09-18 01:09:18 +00:00
Antony Riakiotakis
8e39855b2e
Resurrect the conditional to avoid extra color state changes. Thanks Ender79 for the suggestion!
2011-09-17 17:18:55 +00:00
Campbell Barton
198295e9ca
image button was hard coded to draw the splash screen which it loaded from PNG data on every draw.
...
now pass the ImBuf when callign the image button so we could have different images in buttons later on.
2011-09-17 16:57:37 +00:00
Antony Riakiotakis
18735b6312
Use GL_LINES instead of GL_LINE_LOOP for selected uv edge drawing, avoids an extra conditional and drawing an extra 0 size line per uv.
2011-09-17 15:17:12 +00:00
Antony Riakiotakis
0ed9f5cce7
Fix: Uv edges were incorrectly drawn as selected in uv vert select mode when a sole uv vert was selected.
2011-09-17 14:51:01 +00:00
Brecht Van Lommel
e53c4dae54
Recast/detour: fix some property enum identifiers to follow conventions.
2011-09-17 13:33:03 +00:00