Revision 3ba6ff6 by Campbell Barton February 15, 2018, 22:14 (GMT) |
Cleanup: quiet warning |
Revision a24be95 by Clément Foucault February 15, 2018, 18:16 (GMT) |
GWN: Fix ubo debug printf |
Revision e401e2d by Clément Foucault February 15, 2018, 18:16 (GMT) |
GWN: Fix attrib arrays giving incorrect name depending on the platform. It seems that some opengl implementations are returning "[0]" after array names but some others dont. Remove the "[0]" so everything is consistent. |
Revision 4438325 by Brecht Van Lommel February 15, 2018, 17:15 (GMT) |
Merge branch 'master' into blender2.8 |
Revision e03f335 by Brecht Van Lommel February 15, 2018, 17:13 (GMT) |
Code cleanup: simplify switch statement, ensure we catch missing enums. |
Revision b1ee10a by Brecht Van Lommel February 15, 2018, 17:00 (GMT) |
Fix T54073: crash and uninitialized memory in Cycles displacement hashing. |
Revision ad37ccb by Brecht Van Lommel February 15, 2018, 17:00 (GMT) |
Fix crash reading deg_point_cache_transform.blend test, saved with 2.8. In general 2.8 files may not be readable in master, but might as well fix this case so all the lib/tests can be opened still. |
Revision 4fd3f8d by Sergey Sharybin February 15, 2018, 16:57 (GMT) |
Cleanup: Remove debug-only code |
Revision b879502 by Sergey Sharybin February 15, 2018, 15:58 (GMT) |
Fix T54076: MCE in Graph mode - clip.graph_select_border does not work by header menu While the script should be using INVOKE_PREVIEW for operators in clip view, window manager was lacking some switch statements. Thanks Brecht fore review! |
Revision ca5fdd8 by Campbell Barton February 15, 2018, 14:17 (GMT) |
Merge branch 'master' into blender2.8 |
Revision 2aef87b by Campbell Barton February 15, 2018, 14:13 (GMT) |
Cleanup: rename BLI_thread.h API - Use BLI_threadpool_ prefix for (deprecated) thread/listbase API. - Use BLI_thread as prefix for other functions. See P614 to apply instead of manually resolving conflicts. |
Revision df1c88b by Sergey Sharybin February 15, 2018, 13:15 (GMT) |
Merge branch 'master' into blender2.8 |
Revision ccdacf1 by Campbell Barton February 15, 2018, 12:39 (GMT) |
Cleanup: use '_len' instead of '_size' w/ BLI API - When returning the number of items in a collection use BLI_*_len() - Keep _size() for size in bytes. - Keep _count() for data structures that don't store length (hint this isn't a simple getter). See P611 to apply instead of manually resolving conflicts. |
Revision 4da6c49 by Sergey Sharybin February 15, 2018, 11:41 (GMT) |
Cleanup: Style, braces with macros See https://wiki.blender.org/index.php/Dev:Doc/Code_Style#Braces_with_Macros |
Revision c0bbc4a by Sergey Sharybin February 15, 2018, 11:38 (GMT) |
Cleanup: Remove BLI_ prefix from listbase macro This is kind of doesn't matter where macro itself is defined. We should stick to the following: - If some macro is actually more an inline function, follow regular function name conventions. - If macro is a macro, type it in capitals. Use module prefix if that helps readability or it if helps avoiding accidents. |
Revision 2589f55 by Sergey Sharybin February 15, 2018, 11:33 (GMT) |
Merge branch 'master' into blender2.8 |
Revision 6d4022f by Sergey Sharybin February 15, 2018, 11:24 (GMT) |
Simple hair children: Make twist affected by texture This completes twist feature, which is now possible to also control by texture. Since textures can not easily contain negative values as well, same trick with 0.5 neutral as vertex groups is used. All in all, this twist features allows to do following things. Original hair: {F2287535} Hair with scientifically calculated twist value of 0.5: {F2287540} And we can also twist braids in opposite directions dependent on left/right side: {F2287548} |
Revision 5ce6ca0 by Sergey Sharybin February 15, 2018, 10:53 (GMT) |
Fix T54078: Adding subsurf prior to particle system breaks simple children vgroups and textures cpa->num points to a face index on BASE mesh, but get_child_modifier_parameters() expects index on a FINAL dm. So wrong index was used here. |
Revision 67cec97 by Sergey Sharybin February 15, 2018, 10:53 (GMT) |
Simple hair children: Make twist affected by vertex group The idea is to give a control over direction of twist, and maybe amount of twist as well. More concrete example: make braids on left and right side of character head to be twisting opposite directions. Now, tricky part: we need some negative values to flip direction, but weights can not be negative. So we use same trick as displacement map and tangent normal maps, where 0.5 is neutral, values below 0.5 are considered negative and values above 0.5 are considered positive. |
Revision ffde74a by Sergey Sharybin February 15, 2018, 10:53 (GMT) |
Simple hair children: Initial implementation of twist control It allows to have children hair to be twisted around parent curve, which is quite an essential feature when creating hair braids. There are currently two controls: - Number of turns around parent children. - Influence curve, which allows to modify "twistness" along the strand. |
|