blender-staging.git
8 years agoStitch tool fully functional again. Many thanks to Howard Trickey for proposing the...
Antony Riakiotakis [Wed, 22 Feb 2012 00:06:15 +0000 (00:06 +0000)]
Stitch tool fully functional again. Many thanks to Howard Trickey for proposing the loop winding criterion for normal disambiguation of edges. Unfortunately some extra memory has to be allocated for this to work correctly. If the tool had been initially written for bmesh I would have used the already present adjacency information to make it work, avoiding some extra allocations. Maybe a project for another day though, when I am more proficient with bmesh internals.

8 years agochange UvElement to directly use BMLoop * instead of tfindex. This saves quite some...
Antony Riakiotakis [Tue, 21 Feb 2012 19:41:38 +0000 (19:41 +0000)]
change UvElement to directly use BMLoop * instead of tfindex. This saves quite some lookups on uv sculpting and stitching. Based on BMESH todo by Campbell, thanks for the idea!

8 years agouv stitch static island highlight ported to bmesh system.
Antony Riakiotakis [Tue, 21 Feb 2012 18:20:47 +0000 (18:20 +0000)]
uv stitch static island highlight ported to bmesh system.

Unfortunately since we are missing a way to tesselate uvs, the result will look good only on concave faces since we are essentially using a triangle fan to draw. When a tesselation of uv polygons is possible the tool should also change to use that instead. This will also influence the preview drawing code, coming next.

8 years agoText fix:
Ton Roosendaal [Tue, 21 Feb 2012 18:15:28 +0000 (18:15 +0000)]
Text fix:
Added #blender to list of recommended irc channels.

8 years agoRemove debug print code.
Sergey Sharybin [Tue, 21 Feb 2012 17:27:33 +0000 (17:27 +0000)]
Remove debug print code.
It was harmless because it ifdef-ed, but it's likelly not needed anymore.

8 years agoRemove unused code left from old multires interpolation stuff
Sergey Sharybin [Tue, 21 Feb 2012 17:24:21 +0000 (17:24 +0000)]
Remove unused code left from old multires interpolation stuff

- Removed validate() callback for MDisps layer. It wouldn't actually work
  correct from CustomData layer and all needed data might be validated from
  BMesh interpolation level. Also this callback was never actually used in
  BMesh, so can't see why we'll want to have it in structures.
- Removed layrInterp_mdisps callback. Interpolation now happens from
  another level (bmesh_interp) and this callback isn't needed anymore.
- Removed all function from multires.c which were used by old interpolation
  stuff and seems to be useless for other usages.
- multires_topology_changed is still marked as a TODO, Probably it's not
  needed anymore, buy better to keep for now until it'll be 100% clear this
  function isn't needed and all needed re-allocations happens in bmesh_interp.
  Otherwise, it'll be needed to be ported to new system.

8 years ago- Remove unused code in bmesh interpolation module and switch it to using mathutils
Sergey Sharybin [Tue, 21 Feb 2012 17:24:05 +0000 (17:24 +0000)]
- Remove unused code in bmesh interpolation module and switch it to using mathutils
  functions instead of own macros for vectors.
- Double precision isn't needed here at all. It only makes it impossible to use
  mathutils, adds extra float<->double conversions without any benefits.
  (current multires interpolation is already an approximate method and it can't
  be improved using double precision)

8 years agoImproved displacement flipping algorithm to work properly in cases when target grid...
Sergey Sharybin [Tue, 21 Feb 2012 17:23:32 +0000 (17:23 +0000)]
Improved displacement flipping algorithm to work properly in cases when target grid isn't orthogonal.

Subdivision of face now works pretty smooth, only producing minor unwanted displacement on the along edges.

8 years agoFlip displacement direction after interpolation in bmesh_loop_interp_mdisps
Sergey Sharybin [Tue, 21 Feb 2012 17:23:03 +0000 (17:23 +0000)]
Flip displacement direction after interpolation in bmesh_loop_interp_mdisps

This is needed because displacement might been interpolated from a grid
with different orientation and in this case X and Y components of displacement
are need to be flipped in needed order.

Order of flipping is determining by projecting source grids axis orientation
on target grid axis. This probably will give some unwanted artifacts when
interpolating non-planar face but currently can't think about better way
to determine how to flip displacement.

This commit makes operators like Subdivide works much more unpredictable
for sculpting data, but this stuff should be rethinked much more global
because current approach is not acceptable.

8 years agoFix part of #30272: cycles preview render not updating when changing particle
Brecht Van Lommel [Tue, 21 Feb 2012 16:34:00 +0000 (16:34 +0000)]
Fix part of #30272: cycles preview render not updating when changing particle
emission from with instanced objects.

8 years agoFix [#30281] Left/Right vertex weights flipped.
Bastien Montagne [Tue, 21 Feb 2012 14:45:18 +0000 (14:45 +0000)]
Fix [#30281] Left/Right vertex weights flipped.

Mirror modifier was flipping vgroups on org vertices, not mirrored ones!

8 years agoFix #30270, #30265: cycles not displaying textured objects, and not rendering
Brecht Van Lommel [Tue, 21 Feb 2012 14:39:59 +0000 (14:39 +0000)]
Fix #30270, #30265: cycles not displaying textured objects, and not rendering
text/curve objects after the bmesh merge. Also removed a debug print.

8 years agoSomehow typo was made just before commit in previous patch.
Sergey Sharybin [Tue, 21 Feb 2012 13:00:58 +0000 (13:00 +0000)]
Somehow typo was made just before commit in previous patch.

8 years agoCamera tracing: search area was always centered to marker's position when tracking
Sergey Sharybin [Tue, 21 Feb 2012 12:59:52 +0000 (12:59 +0000)]
Camera tracing: search area was always centered to marker's position when tracking

8 years agoAnother fix for non-VBO flat-shading in sculpt mode, this time for non-multires meshes.
Nicholas Bishop [Tue, 21 Feb 2012 04:24:30 +0000 (04:24 +0000)]
Another fix for non-VBO flat-shading in sculpt mode, this time for non-multires meshes.

As with multires, this change calculates face normals rather than
using vertex normals when the node is flat-shaded.

Flat-shading with VBO on non-multires meshes is still wrong, but
fixing that would require larger changes to our vertex buffers.

8 years agoRemove call to GPU_update_mesh_buffers from GPU_build_mesh_buffers.
Nicholas Bishop [Tue, 21 Feb 2012 04:16:27 +0000 (04:16 +0000)]
Remove call to GPU_update_mesh_buffers from GPU_build_mesh_buffers.

Building the mesh buffers already gets the PBVH_UpdateDrawBuffers flag
set, so this was double-updating the vertex buffer.

8 years agofix [#30264] B-Mesh: Crash when unwrapping ngon mesh with Smart UV project
Campbell Barton [Tue, 21 Feb 2012 03:43:57 +0000 (03:43 +0000)]
fix [#30264] B-Mesh: Crash when unwrapping ngon mesh with Smart UV project

8 years agoremove NGon Interp modifier (which was merged as apart of BMesh),
Campbell Barton [Mon, 20 Feb 2012 23:24:57 +0000 (23:24 +0000)]
remove NGon Interp modifier (which was merged as apart of BMesh),
this didnt really give any advantage over subsurf's Simple-Subdiv mode.

8 years agocopy over a change from bmesh branch that was needed for lightmap unpack to work...
Campbell Barton [Mon, 20 Feb 2012 22:58:00 +0000 (22:58 +0000)]
copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused.

8 years agoDone BMESH_TODO in object/object_vgroup.c (make getSurroundingVerts() use polys/loops...
Bastien Montagne [Mon, 20 Feb 2012 22:16:20 +0000 (22:16 +0000)]
Done BMESH_TODO in object/object_vgroup.c (make getSurroundingVerts() use polys/loops instead of tessfaces).

Also done a few optimizations of related code (OBJECT_OT_vertex_group_fix operator).

8 years agofix for leak in gpu.export_shader(), wasnt freeing the function.
Campbell Barton [Mon, 20 Feb 2012 22:04:29 +0000 (22:04 +0000)]
fix for leak in gpu.export_shader(), wasnt freeing the function.

also change the bmesh iterator so its possible to initialize without stepping.

8 years agoFix normals for flat-shaded non-VBO sculpt drawing.
Nicholas Bishop [Mon, 20 Feb 2012 21:25:24 +0000 (21:25 +0000)]
Fix normals for flat-shaded non-VBO sculpt drawing.

Example here, original on left, fixed normals on right:
http://www.pasteall.org/pic/show.php?id=26925

8 years agoFix broken predivide option for reading in images, patch by Troy Sobotka.
Brecht Van Lommel [Mon, 20 Feb 2012 20:55:30 +0000 (20:55 +0000)]
Fix broken predivide option for reading in images, patch by Troy Sobotka.

8 years agoAnother fix for using boolean slot as integer. This time in dissolve operator.
Sergey Sharybin [Mon, 20 Feb 2012 15:58:01 +0000 (15:58 +0000)]
Another fix for using boolean slot as integer. This time in dissolve operator.

8 years agoFix #30263: tweak threshold option in user preferences was incorrectly placed
Brecht Van Lommel [Mon, 20 Feb 2012 15:29:02 +0000 (15:29 +0000)]
Fix #30263: tweak threshold option in user preferences was incorrectly placed
under NDOF settings, but it's a mouse/tablet setting. Patch by Tobias Johansson.

8 years agoFix cmake warning on Mac, when not using Xcode generator.
Brecht Van Lommel [Mon, 20 Feb 2012 14:19:45 +0000 (14:19 +0000)]
Fix cmake warning on Mac, when not using Xcode generator.

8 years agoFix: cycles crash with multiple OpenCL platforms installed, tracked down by Sergey.
Brecht Van Lommel [Mon, 20 Feb 2012 14:19:34 +0000 (14:19 +0000)]
Fix: cycles crash with multiple OpenCL platforms installed, tracked down by Sergey.

8 years agoFixed incorrect accessing to use_restrict as to integer slot instead of boolean
Sergey Sharybin [Mon, 20 Feb 2012 14:18:14 +0000 (14:18 +0000)]
Fixed incorrect accessing to use_restrict as to integer slot instead of boolean

8 years agoFixed blenderplayer compile for msvc.
Miika Hamalainen [Mon, 20 Feb 2012 08:06:24 +0000 (08:06 +0000)]
Fixed blenderplayer compile for msvc.

8 years agoadd type check asserts for bmesh operator get/set funcs so errors wont fail silently.
Campbell Barton [Mon, 20 Feb 2012 02:04:13 +0000 (02:04 +0000)]
add type check asserts for bmesh operator get/set funcs so errors wont fail silently.

8 years agoadded boolean type for bmesh operators, will make python wrapping clearer and also...
Campbell Barton [Mon, 20 Feb 2012 01:52:35 +0000 (01:52 +0000)]
added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.

also corrected some error reports.

8 years agofix [#30266] B-Mesh: Issue with Weight Painting
Campbell Barton [Mon, 20 Feb 2012 00:18:35 +0000 (00:18 +0000)]
fix [#30266] B-Mesh: Issue with Weight Painting

thanks to Nicholas Bishop for finding the cause of the problem.

don't tesselate on load, this means me->mface will be NULL by default.

we may need to have this set if existing uses of this array are not resolved before release - so add a define USE_TESSFACE_DEFAULT, to change this easily.

this is a rather indirect fix - need to take care here.

8 years agominor edits to have the game engine and player building.
Campbell Barton [Sun, 19 Feb 2012 23:36:10 +0000 (23:36 +0000)]
minor edits to have the game engine and player building.

8 years agofor bake check polygon texface (not tessface-texface)
Campbell Barton [Sun, 19 Feb 2012 22:55:37 +0000 (22:55 +0000)]
for bake check polygon texface (not tessface-texface)

8 years agofix harmless but annoying memory leak prints, "newmem", now free all scanfill memory...
Campbell Barton [Sun, 19 Feb 2012 22:36:24 +0000 (22:36 +0000)]
fix harmless but annoying memory leak prints, "newmem", now free all scanfill memory on exit.

8 years ago- remove some unused editmesh functions.
Campbell Barton [Sun, 19 Feb 2012 22:17:30 +0000 (22:17 +0000)]
- remove some unused editmesh functions.
- copy & rename EditMesh stricts for use with scanfill (remove unused members)

8 years agoBugfix (missed one code line): Copy paste induced bug found by Sv. Lockal.
Daniel Genrich [Sun, 19 Feb 2012 21:15:12 +0000 (21:15 +0000)]
Bugfix (missed one code line): Copy paste induced bug found by Sv. Lockal.

Thank you for pointing this out!

8 years agoBugfix: Copy paste induced bug found by Sv. Lockal.
Daniel Genrich [Sun, 19 Feb 2012 20:59:46 +0000 (20:59 +0000)]
Bugfix: Copy paste induced bug found by Sv. Lockal.

Thank you for pointing this out!

8 years agoB-Mesh:
Thomas Dinges [Sun, 19 Feb 2012 20:29:04 +0000 (20:29 +0000)]
B-Mesh:
* Remove Doubles was missing the info how many vertices were removed, added that back.

8 years agomoved select interior faces into a C function (was python)
Campbell Barton [Sun, 19 Feb 2012 20:27:30 +0000 (20:27 +0000)]
moved select interior faces into a C function (was python)

8 years agoSmoke
Daniel Genrich [Sun, 19 Feb 2012 20:05:01 +0000 (20:05 +0000)]
Smoke
------
New: Child particles are used as emitter.

Based on the patch #30013 by Kai Kostack. Thank you!

Please do test this code!

8 years agoremove more unused files.
Campbell Barton [Sun, 19 Feb 2012 19:32:41 +0000 (19:32 +0000)]
remove more unused files.

8 years agoremove files no longer used since bmesh merge.
Campbell Barton [Sun, 19 Feb 2012 19:27:06 +0000 (19:27 +0000)]
remove files no longer used since bmesh merge.

8 years agoBMesh Merge
Campbell Barton [Sun, 19 Feb 2012 19:12:36 +0000 (19:12 +0000)]
BMesh Merge
===========

initial merge from BMesh branch,

this replaces the existing mesh format and editmode data structures, for more info see:
http://wiki.blender.org/index.php/Dev:2.6/Source/Modeling/BMesh

this is the work of quite a few developers over the years.

Key Contributors
================

* Geoffrey Bantle (aka) Briggs, original author.
* Joe Eager (aka) joeedh

More recently
* Howard Trickey
* Ender79 aka Ender79 :)

What to Expect
==============

In general blender shouldnt crash on files or totally fail to load scenes,
painting tools etc have been tested to work.

* its quite easy to make the tesselator fail (show holes, missing faces), with non planer ngons.
* most modifiers are working fine but a few had to be re-written - bevel, array - array is much slower, bevel will probably be changed to match trunk soon.
* NavMesh BGE feature isn't functional yet.
* Some UV sticth tools still need porting.
* hair doesnt work right on ngons yet.
* many python scripts will break.
* a python api to BMesh needs to be written still.

(for todo's in code do a searh for BMESH_TODO)

8 years agomisc changes from trunk (avoid confusion since these were not intentional differences)
Campbell Barton [Sun, 19 Feb 2012 18:41:30 +0000 (18:41 +0000)]
misc changes from trunk (avoid confusion since these were not intentional differences)

8 years agocopying bmesh dir on its own from bmesh branch
Campbell Barton [Sun, 19 Feb 2012 18:31:04 +0000 (18:31 +0000)]
copying bmesh dir on its own from bmesh branch

8 years agosvn merge ^/trunk/blender -r44235:44250
Campbell Barton [Sun, 19 Feb 2012 17:59:30 +0000 (17:59 +0000)]
svn merge ^/trunk/blender -r44235:44250

8 years agoFix #30230, Crash after importing collada file
Juha Mäki-Kanto [Sun, 19 Feb 2012 17:55:09 +0000 (17:55 +0000)]
Fix #30230, Crash after importing collada file

On collada import a -1 layer_index from CustomData_get_layer_index (CD_MTFACE) was used.
This then managed to overwrite last mface's data with uv-set's name so at least it gave a clue where to look for :]

8 years agofix for bug where particle system would fail when the original mesh had no tessface's
Campbell Barton [Sun, 19 Feb 2012 17:44:36 +0000 (17:44 +0000)]
fix for bug where particle system would fail when the original mesh had no tessface's

8 years agosync some changes with trunk and rename bmeshutils.c
Campbell Barton [Sun, 19 Feb 2012 17:11:40 +0000 (17:11 +0000)]
sync some changes with trunk and rename bmeshutils.c

8 years agorebane files to match trunk.
Campbell Barton [Sun, 19 Feb 2012 16:54:53 +0000 (16:54 +0000)]
rebane files to match trunk.

8 years agoMore pose armature code factorization:
Bastien Montagne [Sun, 19 Feb 2012 11:09:44 +0000 (11:09 +0000)]
More pose armature code factorization:
* New armature_mat_bone_to_pose, which is just the reverse of armature_mat_pose_to_bone (currently used by armature evaluation code only, but might be used by constraints space conversion code too, see note below).
* Found another place where another (a bit erroneous) pose_to_bone code existed (apply_targetless_ik(), in transform_conversion.c, used by "auto ik" option), replaced it by a call to armature_mat_pose_to_bone.

Notes:
* All those changes leave many #if 0 commented code, I will remove those in a few weeks.
* There is at least one other place where generic armature_mat_(pose_to_bone/bone_to_pose) functions should be usable: the space conversion function of constraints (constraint_mat_convertspace(), in BKE's constraint.c), but here I have some problems (old code is also somewhat erroneous, but using new one makes old rigs using bone space constraints wrong, e.g. sintel one, and it’s just impossible to make conversion code...). So I'll wait and investigate more for this one.

8 years agoReload movie clip to ensure all cache and prefetched Ffmpeg frames are properly
Sergey Sharybin [Sun, 19 Feb 2012 08:09:10 +0000 (08:09 +0000)]
Reload movie clip to ensure all cache and prefetched Ffmpeg frames are properly
updating after proxy building is finished.

8 years agoProxies: FFmpeg proxy builder wasn't taking image quality into account at all
Sergey Sharybin [Sun, 19 Feb 2012 08:02:05 +0000 (08:02 +0000)]
Proxies: FFmpeg proxy builder wasn't taking image quality into account at all
which made it using default quality settings which are really bad for camera
tracking (and perhaps for CSE too).

haven't found Jpeg quality setting for FFmpeg which will behave in the same way
as quality setting for image sequence, but seems that mapping image quality
from 1..100 UI range to 31..1 range of qmin/qmax gives expected result.

--
svn merge -r44228:44230 ^/branches/soc-2011-tomato

8 years agostyle cleanyp: split > 120 width lines.
Campbell Barton [Sun, 19 Feb 2012 06:00:20 +0000 (06:00 +0000)]
style cleanyp: split > 120 width lines.

8 years agofix for incorrect check to find largest axis (was checking Y twice, not Z).
Campbell Barton [Sun, 19 Feb 2012 05:17:55 +0000 (05:17 +0000)]
fix for incorrect check to find largest axis (was checking Y twice, not Z).

8 years agoreplace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
Campbell Barton [Sun, 19 Feb 2012 05:11:24 +0000 (05:11 +0000)]
replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.

8 years agofix for issue with bevel when the 2 edges form a straight line. this isnt really...
Campbell Barton [Sun, 19 Feb 2012 04:13:52 +0000 (04:13 +0000)]
fix for issue with bevel when the 2 edges form a straight line. this isnt really fixing the bigger problems but the error did show up baddly as an artifact.

8 years agosvn merge ^/trunk/blender -r44213:44235 --- fixes bmesh shading bug [#30125]
Campbell Barton [Sun, 19 Feb 2012 03:19:58 +0000 (03:19 +0000)]
svn merge ^/trunk/blender -r44213:44235   --- fixes bmesh shading bug [#30125]

8 years agoChange texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.
Campbell Barton [Sun, 19 Feb 2012 03:10:11 +0000 (03:10 +0000)]
Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.

without this each face would get a solid color, this is the same method used in object mode.

also copy BLI_array.h fix from bmesh branch.

8 years agoskip per face texface poly lookup while drawing when the layer isnt found.
Campbell Barton [Sun, 19 Feb 2012 02:54:50 +0000 (02:54 +0000)]
skip per face texface poly lookup while drawing when the layer isnt found.

also remove some unused code.

8 years agoleft print in by mistake
Campbell Barton [Sun, 19 Feb 2012 01:52:59 +0000 (01:52 +0000)]
left print in by mistake

8 years agoedit-derived-mesh had a table for vert/edge/face lookups - that were never used.
Campbell Barton [Sun, 19 Feb 2012 01:51:36 +0000 (01:51 +0000)]
edit-derived-mesh had a table for vert/edge/face lookups - that were never used.

removed these and replaced them with calls to BM_vert_at_index, BM_edge_at_index - which are not ideal but same as trunk does.

8 years agoFix rest of #27022, collada export: add bone parenting of objects
Juha Mäki-Kanto [Sat, 18 Feb 2012 16:55:41 +0000 (16:55 +0000)]
Fix rest of #27022, collada export: add bone parenting of objects

- SceneExporter collects a list of child-objects for armature-object and passes it onto ArmatureExporter
- SceneExporter's writeNodes is then called from ArmatureExporter for matching child-objects for bone.
- ArmatureExporter removes written child-objects from list, objects not exported as being bone parented are exported as direct children of the armature-node.
- Should play nice with current Second Life-compatibility.

A nicer implementation would require some design changes, will have to wait.

8 years agoWring scaling and precision error in previous commit.
Sergey Sharybin [Sat, 18 Feb 2012 16:42:19 +0000 (16:42 +0000)]
Wring scaling and precision error in previous commit.

8 years agoProxies: FFmpeg proxy builder wasn't taking image quality into account at all
Sergey Sharybin [Sat, 18 Feb 2012 16:23:34 +0000 (16:23 +0000)]
Proxies: FFmpeg proxy builder wasn't taking image quality into account at all
which made it using default quality settings which are really bad for camera
tracking (and perhaps for CSE too).

haven't found Jpeg quality setting for FFmpeg which will behave in the same way
as quality setting for image sequence, but seems that mapping image quality
from 1..100 UI range to 31..1 range of qmin/qmax gives expected result.

8 years agoCollada export: changes to joints/weights in skincontroller
Juha Mäki-Kanto [Sat, 18 Feb 2012 16:20:24 +0000 (16:20 +0000)]
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).

8 years agoMerging r44140 through r44226 from trunk into soc-2011-tomato
Sergey Sharybin [Sat, 18 Feb 2012 16:12:22 +0000 (16:12 +0000)]
Merging r44140 through r44226 from trunk into soc-2011-tomato

8 years agoMinor change collada export; don't even run the parentinv-test when ob->parent is...
Juha Mäki-Kanto [Sat, 18 Feb 2012 15:41:09 +0000 (15:41 +0000)]
Minor change collada export; don't even run the parentinv-test when ob->parent is NULL

8 years agoBGE bug #30173: ImageRender not working when initialized on frame 1. This was because...
Benoit Bolsee [Sat, 18 Feb 2012 15:25:31 +0000 (15:25 +0000)]
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.

8 years agominor bmesh api changes.
Campbell Barton [Sat, 18 Feb 2012 11:44:30 +0000 (11:44 +0000)]
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.

8 years agoRemesh modifier: extensive refactoring of the Octree class.
Nicholas Bishop [Sat, 18 Feb 2012 11:34:53 +0000 (11:34 +0000)]
Remesh modifier: extensive refactoring of the Octree class.

The changes mostly center around two new structures, InternalNode and
LeafNode. These provide an explicit representation of the Octree
nodes, which formerly were manipulated as opaque byte arrays.

A fair amount of commented out/unused code was also removed. This
includes the "CINDY" code, which may yet be useful, easy to bring back
if so.

There should be no difference in the output of the remesh modifier,
but memory usage may be slightly different. The flood fill bytes are
no longer optional; they will be allocated whether or not the 'remove
disconnect components' flag is set. The leaf node is probably not as
tightly packed due to alignment issues; this could be fixed with the
__attribute__((packed)) flag in gcc (probably there's an MSVC
equivalent), but not sure it's worth it. The internal nodes should
take up less space on 32-bit systems, allocating sizeof(pointer) now
rather than constant eight bytes.

These changes were made in persuit of bug #30158 (remesh crashes on
PowerPC). There's still a fair amount of bitwise stuff in the Octree,
so may still be endian issues and not yet sure if this fixes the bug,
but should be much easier to track down problems now.

8 years ago#collada animation import, bugfix #29082
Arystanbek Dyussenov [Sat, 18 Feb 2012 06:22:20 +0000 (06:22 +0000)]
#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.

8 years agoremove function for testing selection (was only used in a few places)
Campbell Barton [Fri, 17 Feb 2012 21:49:24 +0000 (21:49 +0000)]
remove function for testing selection (was only used in a few places)

8 years agoremove OBJ export, better rely on the python exporter.
Campbell Barton [Fri, 17 Feb 2012 21:37:16 +0000 (21:37 +0000)]
remove OBJ export, better rely on the python exporter.

8 years agomore syncing smaller changes with trunk
Campbell Barton [Fri, 17 Feb 2012 21:32:30 +0000 (21:32 +0000)]
more syncing smaller changes with trunk

8 years agominor edits to sync up with trunk, remove crash save handler, this can be added later...
Campbell Barton [Fri, 17 Feb 2012 21:22:18 +0000 (21:22 +0000)]
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.

8 years agosvn merge ^/trunk/blender -r44204:44213
Campbell Barton [Fri, 17 Feb 2012 21:07:18 +0000 (21:07 +0000)]
svn merge ^/trunk/blender -r44204:44213

8 years ago- Fixed linking errors of blender player with CMake and XDND enabled
Sergey Sharybin [Fri, 17 Feb 2012 20:59:21 +0000 (20:59 +0000)]
- 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

8 years agosvn merge ^/trunk/blender -r44189:44204
Campbell Barton [Fri, 17 Feb 2012 20:56:25 +0000 (20:56 +0000)]
svn merge ^/trunk/blender -r44189:44204

8 years agoglog should now compile fine at FreeBSD 9 platform
Sergey Sharybin [Fri, 17 Feb 2012 20:53:34 +0000 (20:53 +0000)]
glog should now compile fine at FreeBSD 9 platform

8 years agoXDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_...
Sergey Sharybin [Fri, 17 Feb 2012 20:51:39 +0000 (20:51 +0000)]
XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons

Disabled on FreeBSD platforms due to some linking errors.

8 years agoremove section in gotcha's doc about matrix col/row order since this has been changed.
Campbell Barton [Fri, 17 Feb 2012 20:41:41 +0000 (20:41 +0000)]
remove section in gotcha's doc about matrix col/row order since this has been changed.

8 years agoFixed compilation error cased by recent refactor of include guard defines.
Sergey Sharybin [Fri, 17 Feb 2012 19:45:27 +0000 (19:45 +0000)]
Fixed compilation error cased by recent refactor of include guard defines.

8 years agopatch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
Campbell Barton [Fri, 17 Feb 2012 19:21:47 +0000 (19:21 +0000)]
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.

8 years agounify include guard defines, __$FILENAME__
Campbell Barton [Fri, 17 Feb 2012 18:59:41 +0000 (18:59 +0000)]
unify include guard defines, __$FILENAME__

without the underscores these clogged up the namespace for autocompleation which was annoying.

8 years agoUse BLF API to check whether translation is enabled, when possible!
Bastien Montagne [Fri, 17 Feb 2012 18:04:49 +0000 (18:04 +0000)]
Use BLF API to check whether translation is enabled, when possible!

8 years agoadd note to avoid confusion with angle_v3v3v3, also minor change with angle compariso...
Campbell Barton [Fri, 17 Feb 2012 17:47:10 +0000 (17:47 +0000)]
add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg).

8 years agoReturning magic _USE_MATH_DEFINES to esm tracker.
Sergey Sharybin [Fri, 17 Feb 2012 17:34:16 +0000 (17:34 +0000)]
Returning magic _USE_MATH_DEFINES to esm tracker.
Needed to make constants like M_E defined in msvc. Was occasionally
removed on moving main changes in libmv from patch files in blender
repo to won repo (rev44190).

8 years agoIn fact, snapping in particle edit mode also might make sense.
Sergey Sharybin [Fri, 17 Feb 2012 17:25:51 +0000 (17:25 +0000)]
In fact, snapping in particle edit mode also might make sense.
Pardon for extra noise..

8 years agoRevert part of own recent header cleanup: pivot and manipulators in fact makes sense...
Sergey Sharybin [Fri, 17 Feb 2012 17:22:37 +0000 (17:22 +0000)]
Revert part of own recent header cleanup: pivot and manipulators in fact makes sense in particle edit mode.

8 years agoReverting changes made to build systems when was upgrading OpenAL.
Sergey Sharybin [Fri, 17 Feb 2012 16:58:34 +0000 (16:58 +0000)]
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).

8 years agoDrag-n-drop support on Linux
Sergey Sharybin [Fri, 17 Feb 2012 16:58:09 +0000 (16:58 +0000)]
Drag-n-drop support on Linux

This commit implements drag-n-drop support from external applications into Blender.
Used xdnd implementation from Paul Sheer.

8 years agoMinor fixes found while working on keyingsets.
Bastien Montagne [Fri, 17 Feb 2012 16:34:28 +0000 (16:34 +0000)]
Minor fixes found while working on keyingsets.

8 years agoFix #25649: Image editor paint icon missing until enter weight paint
Sergey Sharybin [Fri, 17 Feb 2012 16:06:32 +0000 (16:06 +0000)]
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.

8 years agosvn merge ^/trunk/blender -r44136:44189
Campbell Barton [Fri, 17 Feb 2012 15:51:48 +0000 (15:51 +0000)]
svn merge ^/trunk/blender -r44136:44189

8 years agoCamera tracking: switch to own repo of libmv where most of patches are applied
Sergey Sharybin [Fri, 17 Feb 2012 15:39:32 +0000 (15:39 +0000)]
Camera tracking: switch to own repo of libmv where most of patches are applied
and which includes latest changes from Keir's branch.

Hopefully it'll make backporting of changes back to main libmv repo easier.

8 years agofa_PE is no valid language code (how comes no one noted that yet?), fa_IR seems the...
Bastien Montagne [Fri, 17 Feb 2012 12:27:58 +0000 (12:27 +0000)]
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...).

8 years agoFix for recent changes in 3D viewport header: object might be missed and in this
Sergey Sharybin [Fri, 17 Feb 2012 11:46:28 +0000 (11:46 +0000)]
Fix for recent changes in 3D viewport header: object might be missed and in this
case check for current mode isn't needed

8 years agoMissed this changes needed to fully support animation data in movie clips.
Sergey Sharybin [Fri, 17 Feb 2012 10:54:21 +0000 (10:54 +0000)]
Missed this changes needed to fully support animation data in movie clips.

Thanks to Joshua pointed into missed changes!