Andrew Wiggin
87702e1c43
Fix loading .blend files (disable pre-bmesh forward-compat code for loading MPolys and converting to MFaces)
2011-12-28 21:38:21 +00:00
Howard Trickey
47007e70f9
Fix compile error from commit 42941
2011-12-28 21:09:29 +00:00
Sergey Sharybin
becc094119
Fix #29692 : 3D Scene is Rendering Bright in the VSE
...
profile conversion for sequencer result sued to happen even if
color management is disabled for scene which made frames brighter.
2011-12-28 20:11:36 +00:00
Brecht Van Lommel
9d3f5ea334
Fix #29715 : cycles and glsl normal node not working correct.
2011-12-28 19:42:22 +00:00
Sergey Sharybin
c2ae77e5bd
Merging r42896 through r42944 from trunk into soc-2911-tomato
2011-12-28 18:31:32 +00:00
Sergey Sharybin
fe2131367b
Fix #29696 : Crash on exit of edit mode after deleting contents of fluid domain
...
Added NULL-check to copying material number and flags when loading cache
2011-12-28 17:59:56 +00:00
Campbell Barton
ae2ff6fe47
svn merge ^/trunk/blender -r42935:42940
2011-12-28 15:14:52 +00:00
Thomas Dinges
6e94bdd8e4
Scons/FFMPEG:
...
* Fixing compile error, ffmpeg include was missing.
2011-12-28 15:08:58 +00:00
Campbell Barton
74b3584181
correct define
2011-12-28 15:07:00 +00:00
Campbell Barton
45ac43946f
files from bmesh now load in trunk, this way loading (2.64 (or whenever bmesh is merged)), wont crash 2.62.
2011-12-28 14:58:45 +00:00
Campbell Barton
ba6f211226
fix for recent compile error
2011-12-28 14:55:45 +00:00
Campbell Barton
7c417fbcfb
WIP bmesh trunk sync, excuse the noise
2011-12-28 14:26:59 +00:00
Campbell Barton
ac4579d4c9
syncing with trunk, remove unused function
2011-12-28 14:22:46 +00:00
Campbell Barton
8ccf5026e0
more changes from bmesh into trunk (mesh mpoly strict member)
2011-12-28 14:21:51 +00:00
Campbell Barton
bf4deba4d5
svn merge ^/trunk/blender -r42927:42931
2011-12-28 14:05:02 +00:00
Campbell Barton
5b88e16306
WIP loading bmesh in trunk, some conversion functions for this purpose.
2011-12-28 13:50:33 +00:00
Campbell Barton
ca94cb1237
merge bleshes BLI_array header lib into trunk.
2011-12-28 13:40:14 +00:00
Campbell Barton
07afa420f2
svn merge ^/trunk/blender -r42920:42927
2011-12-28 13:33:35 +00:00
Brecht Van Lommel
b9ff5840a6
Code refactoring: add unified image buffer functions for doing float => byte,
...
byte => float, float => float, byte => byte conversions with profile, dither
and predivide. Previously code for this was spread out too much.
There should be no functional changes, this is so the predivide/table/dither
patches can work correctly.
2011-12-28 13:29:33 +00:00
Campbell Barton
974c161b50
minor edits
2011-12-28 13:24:49 +00:00
Campbell Barton
1f02209957
enable USE_BMESH_FORWARD_COMPAT and merge in some customdata functions
2011-12-28 13:23:59 +00:00
Campbell Barton
312b080397
initial merge of bmesh customdata layer code into trunk, ifdef'd out for now with USE_BMESH_FORWARD_COMPAT.
2011-12-28 13:15:17 +00:00
Campbell Barton
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
Sergey Sharybin
c5a81536ca
Add FFmpeg libraries versions to system-info.txt
2011-12-28 12:35:58 +00:00
Campbell Barton
f7609ed5f5
svn merge ^/trunk/blender -r42918:42920
2011-12-28 11:20:45 +00:00
Campbell Barton
0b00bb236c
make MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA
2011-12-28 11:08:38 +00:00
Campbell Barton
ff2eb8d72f
svn merge ^/trunk/blender -r42914:42918
2011-12-28 10:27:25 +00:00
Campbell Barton
2e92b14bc6
copy BLI_edgehash changes from bmesh branch, main change is use of mempool.
2011-12-28 10:20:37 +00:00
Campbell Barton
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
Campbell Barton
86b184dc9b
un-inline edgehash functions, BLI_edgehash_insert especially was too large to inline
2011-12-28 09:47:24 +00:00
Campbell Barton
5d46acd59f
minor edits and correcton to assert
2011-12-28 09:14:09 +00:00
Campbell Barton
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
Campbell Barton
317b3c7f3f
svn merge ^/trunk/blender -r42902:42911
2011-12-28 08:36:25 +00:00
Campbell Barton
8de51d3736
reduce size of typemap, and minor changes to sync with trunk
2011-12-28 08:33:19 +00:00
Campbell Barton
b459067dd2
minor changes from bmesh into trunk
2011-12-28 08:29:03 +00:00
Campbell Barton
f89aeae10c
sync some edits with bmesh
2011-12-28 07:43:06 +00:00
Campbell Barton
dab41e0499
macro for getting next/previous MPoly loops
2011-12-28 07:10:27 +00:00
Campbell Barton
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
Campbell Barton
6d878810c6
for bpy.props, when 'name' argument is not initialized, vallback to the attribute name rather than an empty string.
2011-12-28 04:25:46 +00:00
Tamito Kajiyama
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
Campbell Barton
74b1a6465f
saving to legacy mesh format is now functional
2011-12-27 13:44:15 +00:00
Campbell Barton
38f8c897e7
svn merge ^/trunk/blender -r42886:42902
2011-12-27 13:28:30 +00:00
Campbell Barton
0059b8dd96
option to save as older mesh format (ifdef'd for now)
2011-12-27 13:17:58 +00:00
Howard Trickey
edd6f21f6c
Change visualize indices so that edit select mode chooses which elements are visualized
2011-12-27 12:50:23 +00:00
Jens Verwiebe
8de512fe09
OSX: adding PNG codec to QTKit, to have one more alpha enabled one atm
2011-12-27 11:29:27 +00:00
Sergey Sharybin
6963e43148
More fixes for timecode usage with BKE_movieclip_get_ibuf_flag
2011-12-27 11:09:06 +00:00
Sergey Sharybin
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
Jens Verwiebe
86037ca59f
OSX: adding some more codecs to QTKit
2011-12-27 10:51:01 +00:00
Sergey Sharybin
fd134927dd
Merging r42800 through r42895 from trunk into soc-2011-tomato
2011-12-27 10:11:07 +00:00
Sergey Sharybin
a0e62e77d7
Update build files to use new OpenAL libraries
2011-12-27 09:37:19 +00:00
