May 11, 2015, 16:02 (GMT) |
Use stubs for glrecti/glrectf to make sure the matrix stacks have been committed. |
May 11, 2015, 15:49 (GMT) |
Cycles: check for F16C support with __cpuid, as we do for BMI and BMI2 |
May 11, 2015, 15:44 (GMT) |
Merge branch 'master' into temp_viewport_fx_merge |
May 11, 2015, 15:29 (GMT) |
Depsgraph: Make source closer to master There were some unwanted changes, probably caused by not really correct merge conflict resolving. And also reverted whole bunch of changes related on global enabling of C++11 with MINGW. We don't use C++11 by default now, so Blender should still be compilable. |
May 11, 2015, 15:25 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
May 11, 2015, 15:24 (GMT) |
Merge branch 'master' into asset-experiments |
May 11, 2015, 15:22 (GMT) |
Collada Exporter: sanitize a bit lnor export. In case `BKE_mesh_calc_normals_split()` would fail, exporter would read uninitialized random mem... Should not happen, but better be safe than sorry. |
May 11, 2015, 15:12 (GMT) |
Clearing preview image shall also unset 'user edited' flag! |
May 11, 2015, 15:09 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenkernel/BKE_icons.h source/blender/blenkernel/intern/icons.c source/blender/editors/include/UI_interface_icons.h source/blender/editors/interface/interface_icons.c source/blender/makesrna/intern/rna_ID.c |
May 11, 2015, 14:56 (GMT) |
Merge branch 'master' into depsgraph_refactor |
May 11, 2015, 14:53 (GMT) |
Revert "Depsgraph: Rename SPaceType->new to SpaceType->alloc" Use alternative and less intrusive approach for dealing with "new" keyword. This reverts commit c13455e3328c60fae2deecd7a9d8f0d827715f32. |
May 11, 2015, 14:43 (GMT) |
Merge branch 'master' into ui-preview-buttons |
May 11, 2015, 14:41 (GMT) |
Cycles: Get rid of one more OpenGL matrix manipulation/push/pop. |
May 11, 2015, 14:37 (GMT) |
Expose PreviewImage & custom icons to py API. This commit mainly: * Exposes PreviewImage struct in RNA, including ways for user to set images data. * Adds a new kind of PreviewImage, using a file path and IMB_thumb to get image. * Adds a new kind of custom icon using PreviewImage, unrelated to ID previews system. * Adds a python API (utils.previews) to allow python scripts to access those custom previews/icons. Note that loading image from files' thumbnails is done when needed (deferred loading), not when defining the custom preview/icon. WARNING: for release addons who would want to use this, please keep it to a strict minimum, really needed level. We do not want our UI to explode under hundreds of different flashy icons! For more info, see also the release notes of Blender 2.75 (http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.75/Addons) and the example/templates featured with Blender. Patch by Campbell (ideasman42), Inês (brita) and Bastien (mont29). Differential Revision: https://developer.blender.org/D1255 |
May 11, 2015, 14:28 (GMT) |
Cycles: use vertex buffers when possible to draw tiles on the screen. Not terribly necessary in this case, since we are just drawing a quad, but makes blender overall more GL 3.x core ready. |
May 11, 2015, 14:13 (GMT) |
Remove keyword arg use This API isn't directly accessed, keywords were never used. |
May 11, 2015, 14:07 (GMT) |
add back force reload arg |
May 11, 2015, 13:48 (GMT) |
Merge branch 'master' into ui-preview-buttons |
May 11, 2015, 13:43 (GMT) |
match master |
May 11, 2015, 13:39 (GMT) |
workaround for complain on non-closed previews on exit |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021