df9aafa8bc
sync customdata layers up with trunk. existing bmesh files will crash on load but this is unavoidable.
2011-12-28 13:11:46 +00:00
ff2eb8d72f
svn merge ^/trunk/blender -r42914:42918
2011-12-28 10:27:25 +00:00
2e92b14bc6
copy BLI_edgehash changes from bmesh branch, main change is use of mempool.
2011-12-28 10:20:37 +00:00
2da527b017
un-inline edgehash functions, BLI_edgehash_insert was far too big to inline.
...
and have edge hash use unsigned ints since edge verts are unsigned ints for MEdge's
2011-12-28 10:06:10 +00:00
5d46acd59f
minor edits and correcton to assert
2011-12-28 09:14:09 +00:00
337d397d09
merge in customdata changes from BMesh - biggest change is caching the layer index values in a typemap.
2011-12-28 09:11:11 +00:00
8de51d3736
reduce size of typemap, and minor changes to sync with trunk
2011-12-28 08:33:19 +00:00
dab41e0499
macro for getting next/previous MPoly loops
2011-12-28 07:10:27 +00:00
4bc4c018d1
set mloop edge and vertex as unsigned ints since face/edge reference verts as unsigned ints too
2011-12-28 04:43:29 +00:00
0896a22723
Merged changes in the trunk up to revision 42902.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
38f8c897e7
svn merge ^/trunk/blender -r42886:42902
2011-12-27 13:28:30 +00:00
0059b8dd96
option to save as older mesh format (ifdef'd for now)
2011-12-27 13:17:58 +00:00
6963e43148
More fixes for timecode usage with BKE_movieclip_get_ibuf_flag
2011-12-27 11:09:06 +00:00
0ac3ab752f
Fix #29688 : Timecode is not used in tracking
...
Use proper timecode flags sending to BKE_movieclip_get_ibuf_flag function,
so now frames for tracking would be full-resolution but calculated using
timecode defined in th interface,
2011-12-27 10:52:23 +00:00
fd134927dd
Merging r42800 through r42895 from trunk into soc-2011-tomato
2011-12-27 10:11:07 +00:00
de14457abf
option to save bmesh files in older mesh format so they can load in older versoons of blender.
...
- saves UV's and VCols
- skips NGons
- resulting files load in both BMesh and Trunk.
TODO - add an option in the UI to access this.
2011-12-27 08:39:55 +00:00
dab71f9b12
svn merge ^/trunk/blender -r42882:42886
2011-12-27 04:08:21 +00:00
397d7d949f
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
2cd5436a81
svn merge ^/trunk/blender -r42839:42871
2011-12-25 21:31:19 +00:00
02d72b5c07
include BLO_sys_types in customdata header rather than stdint directly.
2011-12-25 21:27:23 +00:00
856208dba2
OSX/gcc-4.6, fix for typedef uin64_t
2011-12-24 08:03:43 +00:00
eb3beca8d4
replace u_int64_t with cc99's uint64_t as suggested by Nicholas Bishop.
2011-12-24 03:03:42 +00:00
b21a0f4fa1
formatting edits 120 line length
2011-12-24 02:37:42 +00:00
9bb0303221
Bugfix for [ #29684 ] Output video presets messed up
...
* This was caused ny the ImageType refactor.
* Problem persisted with Quicktime too, could not test that, but should fix presets there too.
2011-12-23 22:07:34 +00:00
ddcf56366d
change customdata mask from an 'unsigned int' to an 'u_int64_t', since BMesh branch has run out of bits
2011-12-23 20:30:23 +00:00
5df049f390
fix [ #29683 ] OpenEXR Output Appears to be broken
...
own error with moving image settings.
2011-12-23 20:26:37 +00:00
4ced91da47
svn merge ^/trunk/blender -r42778:42839
2011-12-23 08:41:53 +00:00
4d7c44717a
Code cleanup: fix some clang static checker warnings.
2011-12-22 20:29:44 +00:00
51016c4dea
split >120 length lines (mostly if statements)
2011-12-22 00:03:20 +00:00
96bd647c4f
split some >120 lines, no functional changes
2011-12-21 22:56:06 +00:00
0772ebc02c
fix for use of uninitialized value for ipo conversion.
2011-12-21 21:40:21 +00:00
9774c93435
Merging r42770 through r42799 from trunk into soc-2011-tomato
2011-12-21 14:50:05 +00:00
8fbff6100d
Added Record run no gaps timecode for movie clips.
...
Also get rid of hardcoded constants in readfile and use constants from ImBuf headers.
2011-12-21 11:01:08 +00:00
1fef05084e
svn merge ^/trunk/blender -r42761:42776
2011-12-20 22:08:24 +00:00
921b2ee2d4
Merging r42723 through r42769 from trunk into soc-2011-tomato
2011-12-20 17:24:20 +00:00
738fdc7b6f
New modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomData layers only (e.g. UVProject and WeightVG ones).
...
Also, allow applying to obdata those modifiers, even with shapekeys, but do not allow applying them *as* shapekey (as shapekeys do not have CD layers).
Fix [#29636 ] Vertex Weight Mix modifier "apply" button don't work.
Note: applying whit shape keys currently always uses base shape, not current one (for apply to obdata as well as apply to shapekey), but this is another topic...
2011-12-20 14:15:59 +00:00
84b58df85a
svn merge ^/trunk/blender -r42742:42757
2011-12-20 08:09:46 +00:00
a7a6049978
minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.
2011-12-20 02:04:35 +00:00
efb4eff353
svn merge ^/trunk/blender -r42722:42742
2011-12-20 01:33:14 +00:00
a7bae8474b
calculate weight paint colors once per vertex rather then on every face corner (was doing the same deform vert lookup and color calculation multiple times per vertex),
...
Quick shows over 2x speedup in my tests, will give bigger speedup with more vertex groups.
If you happen to have vertices with no faces using them - vertex colors will be calculated unnecessarily, but this isnt a common use case for weight paint mode.
2011-12-19 22:55:04 +00:00
1dc74acc12
Object tracking: configurable scale for object solution
...
Added slider to define scale of object solution which is used to define
"depth" of object relative to camera position. This slider effects on all
"users" of object solution such as bundles display, constrained objects and so.
Added new operator called "Set Solution Scale" to set real scale for object
solution based on real distance between two bundles reconstructed for this object.
New slider and operator can be found on "Object" panel in toolbox when in
reconstruction mode and active tracking object isn't a camera.
2011-12-19 15:12:33 +00:00
Lukas Toenne
26b3dfa30e
Automatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes. This is to make nodes with many sockets cleaner and simpler, which is the purpose of collapsing nodes in the first place.
...
The hiding code uses the SOCK_IN_USE flags already present. These were only temporarily set by the shader node code for determining needed texture coordinate types. Now they are used persistently and updated along with the sock->link pointers.
2011-12-19 12:04:05 +00:00
2457d4f5ab
svn merge ^/trunk/blender -r42680:42722
2011-12-19 10:40:48 +00:00
737648a0bf
Merging r42648 through r42722 from trunk into soc-2011-tomato
2011-12-19 10:39:40 +00:00
90ef435145
Fix a bug in CustomData_duplicate_referenced_layer(_named) functions: MEM_dupallocN does not work with complex layers like CD_MDEFORMVERT ones, so rather use copy func when available.
2011-12-19 08:26:53 +00:00
3708d66c88
Object tracking: forgot to initialize inverted matrix for object solver constraint
2011-12-18 18:03:20 +00:00
b49463c439
cleanup of weight paint color setting code, no functional changes
2011-12-18 12:54:50 +00:00
4a92ee2831
Merged changes in the trunk up to revision 42692.
2011-12-17 21:24:39 +00:00
74a1123059
Quite some compiler warnings...
2011-12-17 16:22:08 +00:00
84236c2502
use 2d copy functions with UV's in more places.
2011-12-17 03:46:38 +00:00
