January 9, 2016, 12:35 (GMT) |
Merge branch 'master' into openvdb |
January 9, 2016, 12:35 (GMT) |
Remove leftover scons files. |
January 9, 2016, 11:56 (GMT) |
PyAPI: Redraw notifier when debug value changes |
January 9, 2016, 11:56 (GMT) |
Cleanup: warning/spelling |
January 9, 2016, 11:31 (GMT) |
Fix T47060: Uv form dupli not working with Cycles when the hair/particles mesh has more than one uv sets. In fact, it was not working with BI either - 'UV from dupli' would always take active UVLayer, not render_active one. Fixed now for both Cycles and BI, and for both particles and 'simple' dupli_face. |
January 9, 2016, 10:38 (GMT) |
January 9, 2016, 10:37 (GMT) |
Decklink test build |
January 9, 2016, 10:31 (GMT) |
January 9, 2016, 10:31 (GMT) |
Decklink test build |
January 9, 2016, 10:31 (GMT) |
Merge remote-tracking branch 'origin/master' into experimental-build |
January 9, 2016, 09:44 (GMT) |
Merge remote-tracking branch 'origin/master' into decklink Just to be sure before using experimental-build |
January 9, 2016, 08:47 (GMT) |
Merge remote-tracking branch 'origin/master' into decklink |
January 9, 2016, 08:42 (GMT) |
Fix broken build from rBd7da51b727725 Please avoid specialized typed enums in headers as widely used as BKE_object.h, we do not want to include DNA_modifiers_type.h everywhere... |
January 9, 2016, 08:29 (GMT) |
Fix (unreported) other joke in our localizing code - setting LIB_TAG_LOCAL tag! This fake tag is zero, so it does not set anything - and it does not clear indirect/extern ones either... |
January 9, 2016, 08:29 (GMT) |
Fix T47121: Image node on linked and localized material loses image after reopening project. Code 'localizing' the node of an ID (a material, here) was kind of a joke, setting id.lib to NULL is not enough, by far! Now calling ntreeMakeLocal(). And ntreeMakeLocal was also missing indirect->extern switch for its directly used IDs, which explains why they were lost after a save/reload. Note that here again, a big part of this 'localizing' code should be made generic using library_query stuff, but this is for id-remap, not current master... |
January 9, 2016, 07:55 (GMT) |
MSVC 2015 do not redefine snprintf |
January 9, 2016, 05:16 (GMT) |
Bring in refactor from other (private) branch. Now the system behaves a bit more like the pointcache. It's about time I merge the changes. |
January 9, 2016, 04:55 (GMT) |
Merge branch 'master' into openvdb Conflicts: source/blender/blenkernel/intern/smoke.c |
January 9, 2016, 03:48 (GMT) |
Smoke (fire): Move spectrum code from C++ (intern/) to C code (BLI) This change is for a few reasons: - it works with color, and (therefore) will need to be color managed, at some point. This will be much easier to do if the code is closer to the actual color management code (in Blender's core, so to speak). - it has nothing to do with the actual fire simulation, as it is just used to create a lookup table - it can be reused for other purposes (i.e. in Blender internal renderer, if people are interrested in a blackbody node � la Cycles) - cleanup: some functions (`contrain_rgb`, `xyz_to_rgb`) already exist in BLI Reviewers: brecht Reviewed By: brecht Subscribers: brecht Differential Revision: https://developer.blender.org/D1719 |
January 9, 2016, 03:37 (GMT) |
Smoke, Dynamic Paint: de-duplicate object subframe update function. As in the title. In the smoke version, there was also an extra 'for_render' parameter that wasn't used, and wasn't used by the callers either, so it was removed altogether. Reviewers: brecht Reviewed By: brecht Subscribers: brecht Differential Revision: https://developer.blender.org/D1718 |
|
|
|


Master Commits
MiikaHweb | 2003-2021