Commit Graph

47594 Commits

Author SHA1 Message Date
Juha Mäki-Kanto
7beddb7506 Collada export: changes to joints/weights in skincontroller
- Collecting joints/weights in one place, it's easier to exclude zero weights or vertexgroups with no matching bone than trying to match same logic in multiple places.
- Still not exporting -1 joints for vertices without weights, but also not outputting -1 joint + weight for each vertexgroup without a matching bone.
- The exported weights are now normalized.

Last I tested this patch stopped 3ds Max crashing on import of file from #29465 (opencollada / internal .dae).
2012-02-18 16:20:24 +00:00
Sergey Sharybin
746e712f7a Merging r44140 through r44226 from trunk into soc-2011-tomato 2012-02-18 16:12:22 +00:00
Juha Mäki-Kanto
e6b708b36b Minor change collada export; don't even run the parentinv-test when ob->parent is NULL 2012-02-18 15:41:09 +00:00
Benoit Bolsee
2478db9d37 BGE bug #30173: ImageRender not working when initialized on frame 1. This was because the canvas display area was initialized on render frame 1, which happens after logic frame 1. Fixed in blender and player by initializing the area on canvas creation. 2012-02-18 15:25:31 +00:00
Campbell Barton
2fd4877c76 minor bmesh api changes.
- use SMOOTH flag for edges (removed sharp flag and inverted), gives us an extra flag slot available.
- rename BM_edge_is_nonmanifold --> BM_edge_is_manifold and invert result, BM_vert_is_nonmanifold too.
2012-02-18 11:44:30 +00:00
Tamito Kajiyama
910f04ca63 Merged changes in the trunk up to revision 44221.
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
2012-02-18 11:26:11 +00:00
Arystanbek Dyussenov
f3bef40b0c #collada animation import, bugfix #29082
Fix skeletal animation import for <rotation>, <scale> and <translate> transform types.

Tested for correctness visually using Seymouranim2.dae from http://collada.org/owl and animated creatures from DKGamesModels folder (from private section of the same site). The results match the results in FXComposer-2.5.

Since this is a fix towards correct reading of collada, it shouldn't break existing compatibility with Second Life.
2012-02-18 06:22:20 +00:00
Tamito Kajiyama
f261d58b6d Fix for a color ramp not immediately updated during the manipulation of a color picker.
This commit complements a similar fix in revision 44171.
2012-02-17 23:27:04 +00:00
Campbell Barton
a677e016d6 remove function for testing selection (was only used in a few places) 2012-02-17 21:49:24 +00:00
Campbell Barton
3e78832dea remove OBJ export, better rely on the python exporter. 2012-02-17 21:37:16 +00:00
Campbell Barton
588b26f18b more syncing smaller changes with trunk 2012-02-17 21:32:30 +00:00
Campbell Barton
24f83c7e3e minor edits to sync up with trunk, remove crash save handler, this can be added later if we need but isnt really apart of bmesh specifically. 2012-02-17 21:22:18 +00:00
Campbell Barton
379527581b svn merge ^/trunk/blender -r44204:44213 2012-02-17 21:07:18 +00:00
Sergey Sharybin
c628f04a7c - Fixed linking errors of blender player with CMake and XDND enabled
- Rest of changes to make XDND switch-off-able: link against extern_xdnd only
  if XDND is enabled
2012-02-17 20:59:21 +00:00
Campbell Barton
48006292d8 svn merge ^/trunk/blender -r44189:44204 2012-02-17 20:56:25 +00:00
Sergey Sharybin
383756be48 Fixed compilation error cased by recent refactor of include guard defines. 2012-02-17 19:45:27 +00:00
Campbell Barton
61596d5bb3 patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
2012-02-17 19:21:47 +00:00
Campbell Barton
2b7ca2304a unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
2012-02-17 18:59:41 +00:00
Bastien Montagne
99d0ba6299 Use BLF API to check whether translation is enabled, when possible! 2012-02-17 18:04:49 +00:00
Campbell Barton
ca4ef8aa26 add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg). 2012-02-17 17:47:10 +00:00
Sergey Sharybin
e097a188da Revert part of own recent header cleanup: pivot and manipulators in fact makes sense in particle edit mode. 2012-02-17 17:22:37 +00:00
Sergey Sharybin
29f0ff718b Reverting changes made to build systems when was upgrading OpenAL.
Reverting to openal from creative because own builds doesn't deal with 3D sound.
Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which
libraries were updated to openal-soft).
2012-02-17 16:58:34 +00:00
Sergey Sharybin
e8a1daaf9b Drag-n-drop support on Linux
This commit implements drag-n-drop support from external applications into Blender.
Used xdnd implementation from Paul Sheer.
2012-02-17 16:58:09 +00:00
Bastien Montagne
7c15fb4f2c Minor fixes found while working on keyingsets. 2012-02-17 16:34:28 +00:00
Sergey Sharybin
8f97f3ed29 Fix #25649: Image editor paint icon missing until enter weight paint
Issue was caused by starting Icon Preview render job from two places:
- Texture buttons for small icon preview
- Properties panel in image editor for large icon of texture

This preview job is starting in suspended mode and if new instance of the same job is
starting, suspended job will be totally stopped. This is normally for cases when you're
changing different settings -- in this case you'd wouldn't want re-render be triggered
on every slide change.
But what we've have with brush preview is that two instances of this job were creating for
large and small icon separately, but because of described policy only one icon was rendered.

If suspended job is getting to be stopped, check if it was started for the same icon
resolution and if not, that resolution will be also rendered in new job.
So it'll be still minimal re-rendering happens, but in cases when job was started from
two places for different icon sizes it'll work just fine.
2012-02-17 16:06:32 +00:00
Campbell Barton
4c66e696fb svn merge ^/trunk/blender -r44136:44189 2012-02-17 15:51:48 +00:00
Bastien Montagne
b7f3887a3a fa_PE is no valid language code (how comes no one noted that yet?), fa_IR seems the right one!
Else, persian was just unavailable on Linux (at least, on Debian...).
2012-02-17 12:27:58 +00:00
Sergey Sharybin
071706e48f Missed this changes needed to fully support animation data in movie clips.
Thanks to Joshua pointed into missed changes!
2012-02-17 10:54:21 +00:00
Sergey Sharybin
ed3b7e2c23 Camera tracking: configurable filter type for 2d stabilization
--
svn merge -r44151:44152 ^/branches/soc-2011-tomato
2012-02-17 08:27:19 +00:00
Sergey Sharybin
fdeca277fd Camera tracking: run aspect correction before stabilizing shot
This commit fixes image stopped being an orthogonal rectangle because of horizontal
scaling caused by pixel aspect ratio happening after rotating image which used to
make orthogonal angles from footage not actually orthogonal.

--
svn merge -r44150:44151 ^/branches/soc-2011-tomato
2012-02-17 08:23:42 +00:00
Sergey Sharybin
0cc2966516 Camera tracking: fixed issue when track used for rotation stabilization points to a freed memory after re-tracking this track.
--
svn merge -r44148:44149 ^/branches/soc-2011-tomato
2012-02-17 08:20:21 +00:00
Sergey Sharybin
026bbecb8f Camera tracking: fixed default value for pixel aspect which wasn't 1.0
--
svn merge -r44147:44148 ^/branches/soc-2011-tomato
2012-02-17 08:19:14 +00:00
Sergey Sharybin
781b4cafbd Camera tracking: fixed incorrect auto-scale calculation for 2d stabilization
--
svn merge -r44146:44147 ^/branches/soc-2011-tomato
2012-02-17 08:17:46 +00:00
Sergey Sharybin
b83577aaec Camera tracking: fix for missing cache invalidation when disabling/enabling channels for stabilized shot
--
svn merge -r44140:44141 ^/branches/soc-2011-tomato
2012-02-17 08:16:29 +00:00
Sergey Sharybin
9d0b7b168f Camera tracking: animation datablock for MovieClip
Added AnimData block to MovieClip datablock which allows to animate different properties in clip.
Currently supports animation of stabilization influence only.

--
svn merge -r44129:44130 ^/branches/soc-2011-tomato
2012-02-17 08:13:45 +00:00
Sergey Sharybin
5fd24dc3f2 Build proxy from meta and image strips used resolution used for display,
not set by building job which leads to unusable proxies.

This change should resolve issues reported in #30229: Sequencer Meta strip Proxy Fails
and probably #30196 will work nicer too.
2012-02-17 07:32:18 +00:00
Sergey Sharybin
283ab431a5 Cleanup of 3D viewport header in painting modes:
- Hide Manipulate center points in sculpt and particle edit modes
- Hide 3D manipulators and orientation from sculpt mode
- Hide snap buttons in sculpt, weight, texture, vertex and particle painting modes

All this options weren't make sense in this modes and might only confuse user.

This will resolve issue #30180: 3D View header buttons and modes
2012-02-17 06:59:32 +00:00
Campbell Barton
02987fd5e1 fix [#30220] Knife Tool Leaks memory
both crash and leak are fixed now.
2012-02-17 05:33:23 +00:00
Campbell Barton
8a2bf0ba54 fix [#30220] Knife Tool Crashes Blender
though there is still a memory leak, but it looks like the leak may be in BLI_smallhash.c, not knife code.
2012-02-17 02:06:30 +00:00
Campbell Barton
ad22305137 fix for error found while looking into #30221
macro needed parentheses.
2012-02-17 00:08:52 +00:00
Tamito Kajiyama
ee49241cfc Fix for a color preview not immediately updated during the manipulation of a color picker.
Problem report by Light BWK through personal communications, thanks!
2012-02-16 21:52:05 +00:00
Campbell Barton
020ec22114 correct for bad assumption in recent commit. angle_v3v3v3 was working as intended. 2012-02-16 20:17:45 +00:00
Thomas Dinges
a56eeb7024 Release Cycle for 2.63:
* BCon1, alpha.
2012-02-16 20:04:33 +00:00
Campbell Barton
d8c2e2ce99 fix for bug with adding icosphere in editmode (was normalizing the verts _after_ translating them away from 0,0,0) 2012-02-16 19:58:40 +00:00
Campbell Barton
19d47c0efd fix [#30208] Bmesh Edit Mode: Add Primitive keeps old verts selected.
cone depth was also incorrectly defaulting to 1.0
2012-02-16 19:33:46 +00:00
Campbell Barton
0e3537e374 fix [#30141] Add primitive sets only the default name "Mesh" 2012-02-16 19:13:04 +00:00
Campbell Barton
b653ebc62c fix for bug when dissolving faces.
When removing an edge between 2 dissolved faces there was no check that a 3rd face was using the edge.
This way dissolving 2 faces could remove faces connected to the removed edges.
2012-02-16 19:00:31 +00:00
Campbell Barton
e67ba3d9df fix [#30209] "Tris to Quad" fails in some cases
dont join 2 triangles if the edge thet share has more then 2 face users.
2012-02-16 17:43:23 +00:00
Campbell Barton
49ab580143 more knit-picky memory saving
don't store a flag array, (or pointer to a flag array) per BMLoop.
saves 4 pointers per quad - obviously, so this can add up a bit.
2012-02-16 16:44:10 +00:00
Sergey Sharybin
eb44d1d0e8 Typo in previous own commit. 2012-02-16 15:55:23 +00:00