Commit Graph

47594 Commits

Author SHA1 Message Date
Sergey Sharybin
c8de268e1b Camera tracing: search area was always centered to marker's position when tracking 2012-02-21 12:59:52 +00:00
Nicholas Bishop
88a2be1846 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.
2012-02-21 04:24:30 +00:00
Nicholas Bishop
a6dc47b0ca 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.
2012-02-21 04:16:27 +00:00
Campbell Barton
3c38830013 fix [#30264] B-Mesh: Crash when unwrapping ngon mesh with Smart UV project 2012-02-21 03:43:57 +00:00
Tamito Kajiyama
9f243d531c Merged changes in the trunk up to revision 44288.
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-21 02:19:54 +00:00
Tamito Kajiyama
7eae1db059 Removed a code segment for debugging (not intended for a commit). 2012-02-21 01:42:03 +00:00
Tamito Kajiyama
69289c978e Merged changes in the trunk up to revision 44266 (including BMesh).
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
2012-02-21 01:40:04 +00:00
Campbell Barton
89a5cf40e3 remove NGon Interp modifier (which was merged as apart of BMesh),
this didnt really give any advantage over subsurf's Simple-Subdiv mode.
2012-02-20 23:24:57 +00:00
Campbell Barton
71146bf93b copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused. 2012-02-20 22:58:00 +00:00
Bastien Montagne
6d3cdbe0e5 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).
2012-02-20 22:16:20 +00:00
Campbell Barton
c4e7cc3287 fix for leak in gpu.export_shader(), wasnt freeing the function.
also change the bmesh iterator so its possible to initialize without stepping.
2012-02-20 22:04:29 +00:00
Nicholas Bishop
d31e1533a3 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
2012-02-20 21:25:24 +00:00
Brecht Van Lommel
83aeb9cbd5 Fix broken predivide option for reading in images, patch by Troy Sobotka. 2012-02-20 20:55:30 +00:00
Sergey Sharybin
3bcca01c24 Another fix for using boolean slot as integer. This time in dissolve operator. 2012-02-20 15:58:01 +00:00
Sergey Sharybin
5c14048600 Fixed incorrect accessing to use_restrict as to integer slot instead of boolean 2012-02-20 14:18:14 +00:00
Miika Hamalainen
a921d9d22b Fixed blenderplayer compile for msvc. 2012-02-20 08:06:24 +00:00
Campbell Barton
2421058379 add type check asserts for bmesh operator get/set funcs so errors wont fail silently. 2012-02-20 02:04:13 +00:00
Campbell Barton
1953f042e6 added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.
also corrected some error reports.
2012-02-20 01:52:35 +00:00
Campbell Barton
818e19713a 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.
2012-02-20 00:18:35 +00:00
Campbell Barton
40c59b1a3d minor edits to have the game engine and player building. 2012-02-19 23:36:10 +00:00
Campbell Barton
e9f93b9117 for bake check polygon texface (not tessface-texface) 2012-02-19 22:55:37 +00:00
Campbell Barton
1cad189e32 fix harmless but annoying memory leak prints, "newmem", now free all scanfill memory on exit. 2012-02-19 22:36:24 +00:00
Campbell Barton
a368e6771a - remove some unused editmesh functions.
- copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
Tamito Kajiyama
5f093d6a58 Fix for a bug in the computation of smooth edges (used for ridges and valleys). 2012-02-19 21:07:32 +00:00
Thomas Dinges
56e41a3ef0 B-Mesh:
* Remove Doubles was missing the info how many vertices were removed, added that back.
2012-02-19 20:29:04 +00:00
Campbell Barton
0fd176e03d moved select interior faces into a C function (was python) 2012-02-19 20:27:30 +00:00
Daniel Genrich
d8a70df8cc Smoke
------
New: Child particles are used as emitter. 

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

Please do test this code!
2012-02-19 20:05:01 +00:00
Campbell Barton
4504ac27a6 remove more unused files. 2012-02-19 19:32:41 +00:00
Campbell Barton
b1a3d3cea1 remove files no longer used since bmesh merge. 2012-02-19 19:27:06 +00:00
Campbell Barton
dc68210c7e misc changes from trunk (avoid confusion since these were not intentional differences) 2012-02-19 18:41:30 +00:00
Campbell Barton
5148828356 svn merge ^/trunk/blender -r44235:44250 2012-02-19 17:59:30 +00:00
Juha Mäki-Kanto
d6deca4e9d 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 :]
2012-02-19 17:55:09 +00:00
Campbell Barton
85d99737b5 fix for bug where particle system would fail when the original mesh had no tessface's 2012-02-19 17:44:36 +00:00
Campbell Barton
fd89fa15c5 sync some changes with trunk and rename bmeshutils.c 2012-02-19 17:11:40 +00:00
Campbell Barton
eee22fe2f6 rebane files to match trunk. 2012-02-19 16:54:53 +00:00
Bastien Montagne
5cd85ed57e 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.
2012-02-19 11:09:44 +00:00
Sergey Sharybin
0b13390b9f Reload movie clip to ensure all cache and prefetched Ffmpeg frames are properly
updating after proxy building is finished.
2012-02-19 08:09:10 +00:00
Sergey Sharybin
83c91bb22d 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
2012-02-19 08:02:05 +00:00
Campbell Barton
cc90116c5a style cleanyp: split > 120 width lines. 2012-02-19 06:00:20 +00:00
Campbell Barton
e43c80620c fix for incorrect check to find largest axis (was checking Y twice, not Z). 2012-02-19 05:17:55 +00:00
Campbell Barton
02b28e9162 replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times. 2012-02-19 05:11:24 +00:00
Campbell Barton
a006b98c6c 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. 2012-02-19 04:13:52 +00:00
Campbell Barton
bd0f7a290b svn merge ^/trunk/blender -r44213:44235 --- fixes bmesh shading bug [#30125] 2012-02-19 03:19:58 +00:00
Campbell Barton
4450039734 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.
2012-02-19 03:10:11 +00:00
Campbell Barton
22d326a663 skip per face texface poly lookup while drawing when the layer isnt found.
also remove some unused code.
2012-02-19 02:54:50 +00:00
Campbell Barton
4ca1d6f28f left print in by mistake 2012-02-19 01:52:59 +00:00
Campbell Barton
ece3418b4e 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.
2012-02-19 01:51:36 +00:00
Juha Mäki-Kanto
f75bf20c81 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.
2012-02-18 16:55:41 +00:00
Sergey Sharybin
69ee17f0b6 Wring scaling and precision error in previous commit. 2012-02-18 16:42:19 +00:00
Sergey Sharybin
f059167c30 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.
2012-02-18 16:23:34 +00:00