sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
35,526 Commits 2 Branches 0 Tags 753 MiB
348f116fe5
Commit Graph

35526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
c4d9f9e9cf skip sorting loop indices when tesselating if the original poly is a quad or a tri. 2011-12-29 03:24:28 +00:00
Joshua Leung
fc74eea7a4 Mingw - use truly relative instead of absolute-relative paths for Boost and OIIO 
That is, instead of '#../lib/windows/lib_name/include', we're now using BF_LIBNAME + '/include'. This makes it possible to have a single lib folder shared between several local working trees again.
 2011-12-29 02:57:41 +00:00
Campbell Barton
b3197bdf32 optimized version of BLI_mempool_iterstep() which uses branch pradiction to get a little bit more performance, since this is used for looping on all mesh data elements 2011-12-29 02:55:20 +00:00
Campbell Barton
ea36d4eb22 svn merge ^/trunk/blender -r42953:42957 2011-12-29 01:58:47 +00:00
Campbell Barton
85a97f64a7 add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. 
also some cmake formatting edits.
 2011-12-29 01:46:58 +00:00
Dalai Felinto
2ca9a6a004 more mist settings should be accesible to BGE 2011-12-29 01:38:11 +00:00
Campbell Barton
269c087dda file missing from cmake listing 2011-12-28 22:57:25 +00:00
Campbell Barton
cb8090d4c8 svn merge ^/trunk/blender -r42940:42953 2011-12-28 22:55:45 +00:00
Campbell Barton
948a76c8d0 this missed merging from trunk somehow (mesh make local edits) 2011-12-28 22:47:55 +00:00
Campbell Barton
1297f72f78 sync changes from bmesh r42951 + some other minor edits. 2011-12-28 22:46:10 +00:00
Campbell Barton
59457e0184 cache customdata checks to avoid looking up on each call to mesh_loops_to_mface_corners() 2011-12-28 22:37:09 +00:00
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
Brecht Van Lommel
c9830549ea Fix #29689, #29702: cycles render crash with node setups with non-cycles nodes, 
after group socket refactoring.
 2011-12-28 19:42:08 +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
26b0bdc195 svn merge ^/trunk/blender -r42931:42935 2011-12-28 14:28:56 +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
164237b8d5 Fix #29707: Sequencer presets corrupt audio scene settings 
Problem was caused by using amount of channels as integer instead of enum
identifiers in preset files.
 2011-12-28 12:39:35 +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
74ea65d508 svn merge ^/trunk/blender -r42911:42914 2011-12-28 09:21: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