Blender Git Loki

Squashed commit of the following:

commit 78a1999a2b2f198fab650e1f1dbb19249eea5bb3
Author: Martin Felke <[email protected]>
Date: Mon Oct 6 10:59:22 2014 +0200

windows compile fix for inner shard unwrapping, used C99 standard array before there

commit 556c4ae27fa77bee2d86223a48e2494ab3e21ecf
Author: Martin Felke <[email protected]>
Date: Sun Oct 5 20:35:59 2014 +0200

scons compiling fixes

commit 36fa6826a8935abd3590e6a6f76ff08919dd1e6b
Author: Martin Felke <[email protected]>
Date: Sun Oct 5 20:35:26 2014 +0200

cleanup, removed old unused code (old access method with filepointer)

commit 249ccbdca76f0c4845681ef376fe025e78e2cd76
Author: Martin Felke <[email protected]>
Date: Sun Oct 5 15:54:18 2014 +0200

rewrote access to voro++ to direct memory access, no file descriptors needed any more, needs test under win / mac as well

commit 6812ad4a82840ce284d084ec38cdab24231038fe
Merge: c6c495d dc1ca0c
Author: Martin Felke <[email protected]>
Date: Fri Oct 3 17:41:41 2014 +0200

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim

Conflicts:
source/blender/modifiers/SConscript

commit c6c495d7bf6077b30e8b079a7cb5b9a9c13faaf8
Author: Martin Felke <[email protected]>
Date: Fri Oct 3 16:38:30 2014 +0200

forgot copying cluster count when copying modifier settings

commit 3a4344a9fa37f299a9efb6554a8c90c987d902f7
Author: Martin Felke <[email protected]>
Date: Fri Oct 3 11:55:04 2014 +0200

attempts to fix one small memleak in read_struct, but fail.... grrr where on earth this is supposed to be freed again ?

commit 07a4b5c8e29fb207d08011d740af13258e9f9864
Author: Martin Felke <[email protected]>
Date: Thu Oct 2 18:33:32 2014 +0200

set voronoi + boolean as default fracture algorithm

commit 96c15edf23429957687bf108c6d9604a6122637d
Author: Martin Felke <[email protected]>
Date: Thu Oct 2 16:33:29 2014 +0200

quick fix: copy modifier settings when copying the object

commit d8f0f75896632a7255ec20be3fb4079acc86f5e8
Author: Martin Felke <[email protected]>
Date: Thu Oct 2 15:47:40 2014 +0200

memory leak fixes while fracturing, but small leak while loading still present

commit de4e6a8c7428c063cd5a209afb3cdac6efca41cb
Author: Martin Felke <[email protected]>
Date: Wed Oct 1 19:45:18 2014 +0200

re-enabled a bullet(!) assertion which earlier caused frequent crashes in fracture modifier, its not acceptable to disable it (and probably wont help much, either)

commit 86dc5b4e910e0f2d0f4b91c062ef9405343ed70a
Author: Martin Felke <[email protected]>
Date: Tue Sep 30 11:03:09 2014 +0200

fix for compiler errors due to obviously missing includes

commit 0320a2818a0ea4c16b2fbffc1794940c0b06db1e
Author: Martin Felke <[email protected]>
Date: Tue Sep 30 11:02:27 2014 +0200

pre-review cleanup part 2 (style, comment cleanup)

commit 454f6f77908209f4afead646ea3f4d15455c138a
Author: Martin Felke <[email protected]>
Date: Mon Sep 29 20:26:06 2014 +0200

pre-review cleanup part 1 (until object.c, rest will follow in part 2)

commit fbed4211774663e150c11791694d69d812602a1f
Author: Martin Felke <[email protected]>
Date: Thu Sep 25 12:47:16 2014 +0200

removed some old demolition remainders (that was accidentally merged in before)

commit c9db5f28a59954ba9c2520a60ff13e7ba2737d69
Author: Martin Felke <[email protected]>
Date: Wed Sep 24 20:22:49 2014 +0200

merge related compile fix

commit 249a962bf46b6cebffca558d7fae8fc9e8c834c6
Merge: 174b4e3 fc3753b
Author: Martin Felke <[email protected]>
Date: Wed Sep 24 18:38:59 2014 +0200

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim

Conflicts:
source/blender/bmesh/intern/bmesh_operators.c

commit 174b4e3c3961b87090d713e8c1811ae42ac75f85
Merge: f323034 39a080a
Author: scorpion81 <[email protected]>
Date: Wed Sep 24 18:22:54 2014 +0200

Merge pull request #4 from JT-a/fracture_modifier_oldsim

Updated and added GPL headers w/Scorpion81 as contributor.

commit 39a080a238366db1db216c336dc247b553e1821f
Author: JT Nelson <[email protected]>
Date: Fri Sep 19 08:25:46 2014 -0700

Updated and added GPL headers w/Scorpion81 as contributor.

NOTE: did not assign author as copyright holder. BF is assigned as copyright holder.

commit f323034489a4afc0956edb70be42637ed282bbb1
Author: Martin Felke <[email protected]>
Date: Tue Sep 9 21:09:20 2014 +0200

preset update (covering newer settings) and inner vgroup now usable without inner material; but not very useful, hmm (because at higher shardcounts the entire object is selected, due to vgroup selection mechanism)

commit fa9e582898a4a4244c885c4ffb02ed7f9195ffc5
Author: Martin Felke <[email protected]>
Date: Tue Sep 9 08:58:28 2014 +0200

inner faces are added to the existing active UVMap now

commit e5ff9cb8924c7a08264cecb881c376ca993962e4
Author: Martin Felke <[email protected]>
Date: Mon Sep 8 15:00:02 2014 +0200

first attempt of adding UVs to inner faces, need to pack them correctly still and put into separate UV Map....

commit 1a39125f7b9c43a69e56c13069473f72c2a02cfc
Author: Martin Felke <[email protected]>
Date: Fri Sep 5 00:02:20 2014 +0200

fix for percentage (0 means deactivated again if not weighted) and used minimum again for weights

commit 5a5cfba4a61d84b12adb72d02e84daa3ec33ba1d
Author: Martin Felke <[email protected]>
Date: Thu Sep 4 23:37:45 2014 +0200

some bugfixes related to cleanup and taking averages for island weights again

commit 837d3430bc579f48f11e0634670094e808fefadc
Author: Martin Felke <[email protected]>
Date: Thu Sep 4 01:48:21 2014 +0200

constraint crash fix and breaking conditions fix (were evaluated incorrectly)

commit fb95e4598343108fcf2871cff8dcf014379a7d60
Author: Martin Felke <[email protected]>
Date: Thu Sep 4 00:10:44 2014 +0200

take minimum of island weight instead of average as threshold modifier

commit d5e20f82c2f741fd8256b8ddc45e419898792c79
Author: Martin Felke <[email protected]>
Date: Wed Sep 3 23:32:23 2014 +0200

cleanup related compile fixes

commit c9e7a26d2a422ff8e87b83f84b2d7dc0d38fc710
Author: Martin Felke <[email protected]>
Date: Wed Sep 3 22:41:46 2014 +0200

Cleanup for master, part 1, WARNING: Incompatible to older blends to to changes in DNA / loader

commit 8a78bce10b8773d44389c83c945d9fa03c773483
Author: Martin Felke <[email protected]>
Date: Tue Sep 2 22:46:56 2014 +0200

added weighted percentage, distance, angle

commit 1f1573019c06a0bd6086f1f1b69ad997aaee0230
Author: Martin Felke <[email protected]>
Date: Mon Sep 1 13:03:34 2014 +0200

fix attempt for own / extra vertices (was wrong transformation)

commit 8bebaf6e299aaa8f0e391b063e0d7defe90af0a5
Author: Martin Felke <[email protected]>
Date: Sun Aug 31 23:11:18 2014 +0200

fix for: customdata related crash in conjunction with split shards to islands

commit 151d42c4bc1092102378a9a7b4d67768c5e69f27
Author: Martin Felke <[email protected]>
Date: Sun Aug 31 13:32:30 2014 +0200

fix for: fix normals (will be stored and loaded now, and transferred to convert objects too, BUT: split shards to islands has a bug there still) and convert to objects (get rid of all modifiers before fracture in stack, so the result wont be messed up)

commit 21a070ec33d675c2c012ada8377edbc3216f4b71
Author: Martin Felke <[email protected]>
Date: Sat Aug 30 22:09:43 2014 +0200

marking inner edges as sharp for boolean and bisect fill, additional option to fix normals (with edgesplit modifier)

commit 77a2313ee68abe7566e274f453df636e6ac63000
Author: Martin Felke <[email protected]>
Date: Sat Aug 30 11:21:44 2014 +0200

fix for bake to keyframes

commit a955cb0fe8acfd5ca9d3ded66e0defaf9f3ea8b7
Author: Martin Felke <[email protected]>
Date: Fri Aug 29 22:15:17 2014 +0200

attempt for customdata warning fix

commit bb8f482b27fdf4ea14a0e315768029c7f1eeb4b2
Author: Martin Felke <[email protected]>
Date: Fri Aug 29 20:41:57 2014 +0200

own particles transform fix (forgot to multiply with imat)

commit 689909d027db11023bf2a64805ae5a0a891783e6
Author: Martin Felke <[email protected]>
Date: Fri Aug 29 15:09:34 2014 +0200

added fast bisect + fill algorithm

commit 9874aa532daf0232072eab6ea4a835df02878e30
Author: Martin Felke <[email protected]>
Date: Thu Aug 28 23:00:23 2014 +0200

memory leak fix (autohide)

commit f8d4e67c4c5b211b9f9fb71584edd0c8390d6a15
Author: Martin Felke <[email protected]>
Date: Thu Aug 28 22:26:46 2014 +0200

some depgraph fix (related to fracture modifier, and scene_sort_group()

commit fe30202984ee262a8718a6f01e4f1e64a702319c
Author: Martin Felke <[email protected]>
Date: Thu Aug 28 21:33:13 2014 +0200

some depgraph attempts... WARNING: unstable !

commit 1d8c6354992e13829d9373f83edcc94e26794a03
Author: Martin Felke <[email protected]>
Date: Thu Aug 28 18:18:32 2014 +0200

fix for calculate mass crash, and attempt for edgebased fracture with voronoi (disabled, not working yet)

commit b2d724147331386639dfcd278ddd8561c02ec89c
Author: Martin Felke <[email protected]>
Date: Tue Aug 26 11:54:55 2014 +0200

crash fix when loading blend (due to new autohide option)

commit 9f0017e426e3d1e811098da21ba4dd0496f783a4
Author: Martin Felke <[email protected]>
Date: Tue Aug 26 02:33:24 2014 +0200

added autohide distance, by default 0 and deactivated, as it slows down the sim and causes a big memory leak, also crashes randomly sometimes

commit 149c6ed4b5484b7958cb28194de9479c72cf2790
Author: Martin Felke <[email protected]>
Date: Sun Aug 24 13:21:54 2014 +0200

using inner material for finding inner vertex group now, other direct attempt was not successful

commit e79f713a668fd49b9dd281071cb53b8ead11ed5f
Author: Martin Felke <[email protected]>
Date: Fri Aug 22 21:35:59 2014 +0200

float breaking angle and automatic deactivation (manual re-activation) of auto-execute when sim is started

commit 8f9b3ee41b79d80c38c2f1eaed8611c51751c721
Author: Martin Felke <[email protected]>
Date: Tue Aug 19 23:59:06 2014 +0200

fix: mesh shape related memory leak and rebuild constraints after refracture

commit 9486eee9bfb4b1c92e0fd9ea285ab3688009de0f
Author: Martin Felke <[email protected]>
Date: Sun Aug 17 16:08:24 2014 +0200

attempt to create sub-objects by referencing a group of "child" objects within the modifier, but customdata transfer (like textures) wont work for some reason

commit 1bec8ebf5cade44dc2f22155ca4bbe84c819e1fb
Author: Martin Felke <[email protected]>
Date: Wed Aug 13 09:37:24 2014 +0200

fix for inner vertexgroup, it worked on 1 shard only because it was always deleted and recreated for each shard, instead of sharing it (split shard to islands needs an inner material still)

commit 5c7774e1662f4d0d4082578df3f2dd80238b7745
Author: Martin Felke <[email protected]>
Date: Wed Jul 30 11:05:32 2014 +0200

memory leak reduction, there still is a smaller one in readfile.c somewhere, sigh...

commit c605ce3974e73a47f7593b859f6757ed0f5f0147
Author: Martin Felke <[email protected]>
Date: Tue Jul 29 19:51:18 2014 +0200

fix for crash at changing mass when not at frame 1

commit 924fbed8bce2663f64f4b31aecc3310358196c6f
Author: Martin Felke <[email protected]>
Date: Mon Jul 28 16:50:44 2014 +0200

delete constraints always now before deleting meshislands, may crash otherwise

commit 10b03edbc13ee50ab3197394912431da7bb1442d
Author: Martin Felke <[email protected]>
Date: Sun Jul 27 20:28:45 2014 +0200

allow convert to object for modifier on non mesh objects too

commit 6accd5ec1d9547f6b6bdf89f519a4f30fd23e1a3
Author: Martin Felke <[email protected]>
Date: Sun Jul 27 17:27:00 2014 +0200

typo: used SURF instead of SURFACE, prevented panels showing up correctly

commit 870c06a9f54563549a8174fef67deb451aaf35cf
Author: Martin Felke <[email protected]>
Date: Sun Jul 27 17:21:21 2014 +0200

added possibility to fracture text directly

commit 765d2addc2aa547ddb4068d52d1fa3618397d7eb
Author: Martin Felke <[email protected]>
Date: Sun Jul 27 12:36:52 2014 +0200

fix for editmode selection bug, added new option "auto execute" -> enable for editing, disable for simulation

commit 7d6f7b161bb1650da3c2472e5ebd9ee293ee2db8
Author: Martin Felke <[email protected]>
Date: Sat Jul 26 18:47:30 2014 +0200

crash fix for pressing "use constraints" prior to execute fracture

commit 9a4ab59f3353e22e25ca9233a298c9e0e270406a
Author: Martin Felke <[email protected]>
Date: Sat Jul 26 13:33:01 2014 +0200

another fix for the update bug, this time it really should work...

commit 7e3190a51f7d6f6d2eeb1034a6f16d646a66724a
Author: Martin Felke <[email protected]>
Date: Sat Jul 26 11:57:23 2014 +0200

added support for inner vertex group... WARNING: this is still UNSTABLE

commit f21c0c9a4b4229841cf30b9d3950abf4294f449a
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 23:57:10 2014 +0200

forgot to change one BLI_temporary_dir() call to BLI_temp_dir_base()

commit aaf82e554c91109e030781ccf5cec7c1d7e8ebbc
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 21:16:01 2014 +0200

change: rebuilding constraints should work now, BUT you have to put a modifier on all rigidbody objects now, otherwise the regular active rigidbody object will be reset when continuing an interrupted simulation, need to investigate why...

commit 6301adb673bbcacff7b1f5bbc57a7978c604de22
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 20:32:39 2014 +0200

fix for re-enabling the constraints, takes now all objects into account in the first sim step

commit 36ed23d6d5b2b9dcaf4794a579d5d21ea7a0cf91
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 16:55:57 2014 +0200

fix for constraint update bug, all constraints must be re-enabled after a fracturing run if they are not recreated

commit 391c09519c1f0925ac9cb37935c45a60d016c1e1
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 16:55:15 2014 +0200

removed compound shape from RNA (did not work with modifier)

commit 39945517e4882d0de2a66e0a1339baebf3e9c4fb
Author: Martin Felke <[email protected]>
Date: Fri Jul 25 12:08:41 2014 +0200

crash fix with other pointsources, forgot to initialize counts to 0...

commit a3b7f55d56e85339ff622d393b9da7734bdf8278
Author: Martin Felke <[email protected]>
Date: Wed Jul 23 21:28:43 2014 +0200

fix for losing texture images after load (pink object) but this still adds the image to the inner faces unintendedly, only should affect viewport and viewport render, glsl and rendering looks ok

commit 9933f8ce807b29f6a2b2cdd9b02a6155cab30339
Author: Martin Felke <[email protected]>
Date: Mon Jul 21 10:29:02 2014 +0200

convert to objects fix: now should take textures into account too

commit 6b428cfb09f0f3952a788a5fd62c1d30f52e56aa
Author: Martin Felke <[email protected]>
Date: Mon Jul 21 08:37:35 2014 +0200

windows compile fix: replace BLI_temporary_dir() by BLI_temp_dir_base()

commit 2101aaef8306ea8b51057bca530ce8a5aa5f9268
Author: Martin Felke <[email protected]>
Date: Mon Jul 21 08:36:57 2014 +0200

fix for: fix normals, can use modifiers before fracture now too to get correct result

commit ed27f456653bbe1160679985f8f135af44053ca6
Author: Martin Felke <[email protected]>
Date: Sun Jul 20 21:00:15 2014 +0200

revert last change again, was just a test

commit ead157ff398b3c5282279891762cb3b8d15aac62
Author: Martin Felke <[email protected]>
Date: Sun Jul 20 20:43:18 2014 +0200

gitmodules test

commit e67bba1100246f20d4486e3b880dc86ef283238b
Author: Martin Felke <[email protected]>
Date: Sun Jul 20 10:13:57 2014 +0200

merge related compile fixes

commit f1d6d5ab9553b477042e770ce9f7da0109926bdf
Merge: 7988841 3ca78a4
Author: Martin Felke <[email protected]>
Date: Sun Jul 20 06:34:51 2014 +0200

Merge branch 'master' into fracture_modifier_oldsim

Conflicts:
extern/CMakeLists.txt
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_edit.c
source/creator/CMakeLists.txt

commit 79888418c7de6fcae8b51a03636764c2c141b626
Author: Martin Felke <[email protected]>
Date: Tue May 27 19:02:43 2014 +0200

forgot to initialize totvert variable prior to building a kdtree

commit 1ccf1b3e8bd736e258bd9c6cd5cecd416ad44b1a
Author: Martin Felke <[email protected]>
Date: Tue May 27 16:42:00 2014 +0200

fix attempt for halving case, passive groups didnt work properly there

commit 1f2077a8e48785372dd19bc9bbaa47307fb952d6
Author: Martin Felke <[email protected]>
Date: Tue May 27 14:55:25 2014 +0200

added inner material support for boolean and bisect fill

commit eace5891ec6725af842b454d55e0bfa389ff1ace
Author: Martin Felke <[email protected]>
Date: Mon May 26 22:58:42 2014 +0200

added a fix normals option to let cracks in smooth objects nearly disappear, also rotates the vertex normals with the verts... WIP... because i need somehow to get the derivedmesh of the previous modifier in stack if there is one

commit feee2a4a77aecef6a369099ef45216a61f079b72
Author: Martin Felke <[email protected]>
Date: Mon May 26 16:15:06 2014 +0200

added vertweight display for fracture modifier, and attempt to update data in case vgroups are changed, but this doesnt work, seems to require a refracture to interpolate data again

commit 5bac2491934706241167290f94f952ec0839c383
Author: Martin Felke <[email protected]>
Date: Sun May 25 22:05:46 2014 +0200

added vertex group support to mark passive areas of an object (which remain static)
also rudimentary ground toggle / ground connect toggle operators

commit c1515ce4822d27424897ced81b983dd2e0409bf5
Author: Martin Felke <[email protected]>
Date: Sat May 17 13:32:39 2014 +0200

compile fixes after merge

commit 21c06c40f4b74ce1cb60f118fe1da8d351cd09a3
Merge: 1e8aca9 ef2ba65
Author: Martin Felke <[email protected]>
Date: Sat May 17 12:56:31 2014 +0200

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim

Conflicts:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/space_buttons/buttons_context.c

commit 1e8aca99a81a5308d3acf24144bbff6ad19c07ec
Author: Martin Felke <[email protected]>
Date: Wed May 14 23:47:42 2014 +0200

just crash prevention, but mesh can still be messed up when attempting to move mesh out of fracture point location, especially with greasepencil

commit dd957e2be3659a09707faba629f5b8b0433ff45e
Author: Martin Felke <[email protected]>
Date: Wed May 14 23:37:38 2014 +0200

bah, other pointsources than uniform tend to crash, this is a fix attempt for greasepencil (but generally, dont try to move the object after fracturing with greasepencil by hand....

commit 65b6952a6f048f53df89f71987972c29860fa589
Author: Martin Felke <[email protected]>
Date: Wed May 14 10:36:40 2014 +0200

small gui fix in regular rigidbody constraints panel

commit f533d01fc8da6146c11f6a11e3ba4f5ffb35700e
Author: Martin Felke <[email protected]>
Date: Tue May 13 23:22:40 2014 +0200

well, a crash "prevention" with autosmooth, but it doesnt work anymore with the fracture modifier this way.

commit 3b8eccb58fe52a976506da4af1982ed0461ce56b
Author: Martin Felke <[email protected]>
Date: Tue May 13 17:23:06 2014 +0200

added threshold vertexgroup support (a single vertexgroup with weightpainting)

commit d1bbe76be83c2ed7aa76b44008e45614ab13e014
Author: Martin Felke <[email protected]>
Date: Tue May 13 09:28:54 2014 +0200

reactivated modifier editmode "support" (but well, it doesnt really work...) and removed fracture edit mode (didnt work at all)

commit bfd5143aa25dceb03a62968c1c8e79518b9d257e
Author: Martin Felke <[email protected]>
Date: Tue May 13 01:07:33 2014 +0200

added fracture preset storage and fix for loading files -> mesh was doubled there

commit 576c3c5f94ce34c9b7ef1cde68cedf1a7bf53ddc
Author: Martin Felke <[email protected]>
Date: Mon May 12 23:07:06 2014 +0200

re-added contact distance and mass dep. thresholds, also fixed a python gui error -> override solver iterations in scene

commit 3a9261dbdfe4bb354cd8dca1e9cdc48ca4a2c266
Author: Martin Felke <[email protected]>
Date: Mon May 12 13:35:23 2014 +0200

fix for automatical recreation of constraints after loading

commit a0ed785e78ea83530f35a985f4f714ca4267c5de
Author: Martin Felke <[email protected]>
Date: Mon May 12 13:07:43 2014 +0200

fix for not updating fractured mesh with constraints enabled

commit dc96f8014d23ba65a4b52c397ffe9994fe6c5422
Author: Martin Felke <[email protected]>
Date: Sun May 11 20:35:49 2014 +0200

fix attempt for messed up bake data after linking objects

commit c9e920de81898e362b7effb5e200bdd72c0dd89a
Author: Martin Felke <[email protected]>
Date: Sun May 11 19:10:26 2014 +0200

copy rigidbody world when linking objects to scenes (if it exists)

commit 92b42ef2aabd6687a4f0e53f1b622ca39c0d5da8
Author: Martin Felke <[email protected]>
Date: Sun May 11 18:15:57 2014 +0200

can copy rb bakedata now with scene

commit 4e5c2af87167e647a434789d6afe4c5b8c610f22
Author: Martin Felke <[email protected]>
Date: Sun May 11 11:01:05 2014 +0200

crash fix for loading data with halving applied only (and no fracture)

commit 04b00078d887748821e9487600798f8ca27bad23
Author: Martin Felke <[email protected]>
Date: Sat May 10 16:54:59 2014 +0200

progress bar display fix attempt, still glitchy...

commit 9f83814cb5bdf83876c45831e3db3cfcf34709aa
Author: Martin Felke <[email protected]>
Date: Sat May 10 14:19:21 2014 +0200

partial fix for progress display (can still exceed progressbar) and fix of a memoryleak when halving only

commit fb7ef3aed4981c97b594811026d7fd4098709fc4
Author: Martin Felke <[email protected]>
Date: Fri May 9 20:55:46 2014 +0200

copied derivedmesh was not freed after usage

commit c9ad3c2da2002c061fb3e6ef104b39d12ec1a14e
Author: Martin Felke <[email protected]>
Date: Thu May 8 19:34:12 2014 +0200

and even more gui cleanup

commit 35cfca7a2c255af7d5338949a305c6e08f0237f0
Author: Martin Felke <[email protected]>
Date: Thu May 8 14:16:34 2014 +0200

further gui cleanup

commit 4396f9df885deaec5cfe555d7bc40c9169b904c3
Author: Martin Felke <[email protected]>
Date: Thu May 8 01:09:59 2014 +0200

fracture gui cleanup

commit 4e59fa1b4b46e7d3b56589da8afa14eaf4fc35b9
Author: Martin Felke <[email protected]>
Date: Wed May 7 18:31:55 2014 +0200

another crash fix attempt for refreshing constraint data on running / cancelled fracture

commit 9687cb268c6919f07ef0c8ddc798db9299a29520
Author: Martin Felke <[email protected]>
Date: Wed May 7 17:43:30 2014 +0200

partial fix for crash at refresh constraints during fracture, or after cancelling it

commit f4ff8ff5050a2c00bd6a17af7020f760671deb33
Author: Martin Felke <[email protected]>
Date: Wed May 7 10:52:39 2014 +0200

prevent fracture modifier removal when job is running

commit 2cced6f6ff843f95f7977bcc6e5f54f9e687c340
Author: Martin Felke <[email protected]>
Date: Wed May 7 10:16:10 2014 +0200

added running flag to prevent main thread from modifier execution when job runs, avoids crashes

commit 27ef95a4b9214c1ababcca2157804cf965bbf3e4
Author: Martin Felke <[email protected]>
Date: Wed May 7 01:59:48 2014 +0200

added (as experimental setting) the possibility to execute the fracture process as separate threaded job, but this crashes still very often, need to copy the modifier and stuff to a separate context and copy back afterwards

commit 5f286bde0cd0db6d55dc186c4f5af6f420c64cc4
Author: Martin Felke <[email protected]>
Date: Tue May 6 14:38:36 2014 +0200

some code cleanup, and attempt to find memoryleaks, but some are still present, sigh... again customdata related...

commit f158870a9aa86dee1de119140d0418b75ede9cd7
Author: Martin Felke <[email protected]>
Date: Mon May 5 23:33:08 2014 +0200

avoid crash when refresh after split to islands was missing and file was saved, but this is inconsistent sometimes, requiring an additional refresh possibly (due to memoryleaks possibly)

commit 43e4a5b71ef618017d41d640b919b4e7eeaa66fc
Author: Martin Felke <[email protected]>
Date: Mon May 5 13:02:26 2014 +0200

customdata fix for split islands

commit 9df14f9c6703eb9e77e707836d4317f85372fae0
Author: Martin Felke <[email protected]>
Date: Mon May 5 12:55:58 2014 +0200

storage of split islands should work now...

commit 202fd41d1af8642f5eb845af045a7de9a8355b36
Author: Martin Felke <[email protected]>
Date: Sun May 4 17:38:13 2014 +0200

halving "improvement" made it only much worse performancewise, so keep the old one

commit 44d97d0f47fb5887acd4d7aab9c0a3f813cf315e
Author: Martin Felke <[email protected]>
Date: Sun May 4 14:47:58 2014 +0200

added split shards to islands option... but with complex objects you need gazillions of constraints to hold this together... very very slow...

commit b986107829a0991898b86cc970c64146a956d07e
Author: Martin Felke <[email protected]>
Date: Sun May 4 11:11:21 2014 +0200

another pointcache interpolation fix....

commit 3279e9227fa5411b7e1b4853d82be2a39308dd93
Author: Martin Felke <[email protected]>
Date: Sun May 4 02:45:04 2014 +0200

possible fix for pointcache interpolation error with rigidbodies and subframes

commit cad0e8f07e9a2f74658d06d13e129cbcc54b0a2b
Author: Martin Felke <[email protected]>
Date: Fri May 2 20:10:45 2014 +0200

hmm motionblur did work now ? strange... so commiting this as well

commit 991100912a29334dab5d5d46520404ea172ab877
Author: Martin Felke <[email protected]>
Date: Fri May 2 20:03:54 2014 +0200

attempt to enable deform motionblur, FAIL... (object is not rendered at all)

commit e47b30595f5ba9ecfab8e4f586e9cb68f6ac5fe0
Author: Martin Felke <[email protected]>
Date: Fri May 2 17:50:04 2014 +0200

enabled dependsOnTime...

commit 1cdc11656657da1b76f80882a4e920d02c6b580b
Author: Martin Felke <[email protected]>
Date: Fri May 2 16:18:47 2014 +0200

fixed the halving again

commit 3453390bad442f5572facdabd9190bee70fd2395
Author: Martin Felke <[email protected]>
Date: Fri May 2 15:16:30 2014 +0200

deactivate plain voronoi fracture

commit ed2c7c7322479d92f11e7e237093a0c5708e98c3
Author: Martin Felke <[email protected]>
Date: Fri May 2 14:23:52 2014 +0200

crash fix, return null if visible mesh is null

commit cffb510e6526571fee6f7a403cfd5c0feb8d5927
Author: Martin Felke <[email protected]>
Date: Fri May 2 13:46:09 2014 +0200

some constraint change crash fixes

commit caf9d082cd4f6a27cfa3eef6f70a4aa3c8836d45
Author: Martin Felke <[email protected]>
Date: Fri May 2 11:22:33 2014 +0200

some memory leak hunting, but some are still there

commit d7bbdab2f4b3baad0a95671c585c85533ff44233
Author: Martin Felke <[email protected]>
Date: Fri May 2 10:37:23 2014 +0200

removed "fracture level" stuff, did not work properly under windows...

commit 0da7bcb78c3ab0a25c46314fe983aecff1f0f15e
Author: Martin Felke <[email protected]>
Date: Thu May 1 19:45:00 2014 +0200

fix for warning; unnecessary semicolon...

commit 13b97bbc0b5b7ac2c67526c688c402bf45419586
Author: Martin Felke <[email protected]>
Date: Thu May 1 19:15:40 2014 +0200

crash fix attempt for loading fractured blends

commit 82ff09ef1ab2614b9f117227514c37c3295ae2eb
Author: Martin Felke <[email protected]>
Date: Thu May 1 17:45:30 2014 +0200

attempt for saving / loading and texture preservation

commit 0f80a3faafd7eaf0b79f91719f32ae67c66f501a
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 23:59:41 2014 +0200

split the processing loops to an openmp one and an openmp free, due to crappy windows compiler error

commit 94c50f1277b760f5b7c398e07f78011cae45b16e
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 16:10:05 2014 +0200

removed additional customdata markings, added openmp again (first was not working with textures)

commit 2decc0c647c8ffae687e3ac76738d2a54b9c8587
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 14:04:57 2014 +0200

doubled the shard count internally for fast bisect so input count and output count match

commit 3f8806d3948716ce995e71b4a51df94725039fa2
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 12:38:01 2014 +0200

using malloc instead of calloc for bisect fracture

commit 3e26dfc02e0e6c360c5227992317f5d4db5258a1
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 11:32:25 2014 +0200

nullify noisemap, for now to prevent crash on loaded file, modifier free

commit e3adc6e820da85ff05d4ab8476ae79c2c66cb339
Author: Martin Felke <[email protected]>
Date: Wed Apr 30 00:32:50 2014 +0200

changed qsort to BLI_qsort_r

commit 90e500c9187ada89ee72e59bd87cd89b04d2fcbb
Author: Martin Felke <[email protected]>
Date: Tue Apr 29 22:03:34 2014 +0200

added a fast but inaccurate bisection method

commit 5697d6f26db52c9fcd2ef9e46bff45784b41f058
Author: Martin Felke <[email protected]>
Date: Tue Apr 29 12:43:45 2014 +0200

attempt to speedup bisect, but cant use OpenMP now, so a bit slower... but less cpu load...

commit f5e17e1f59f424cd389d9dd25145e25010f0e01c
Author: Martin Felke <[email protected]>
Date: Sun Apr 27 16:45:16 2014 +0200

extended the critical section, hopefully this stabilizes it a bit

commit 9877852266a332257187de2dd7018f4ac25334b2
Author: Martin Felke <[email protected]>
Date: Sun Apr 27 14:59:00 2014 +0200

tried to increase speed by openmp, but crashes more often now, especially when freeing things (double free...) hrm

commit fb2198dfe3ce762b6af38f43c7620c45d1d5940c
Author: Martin Felke <[email protected]>
Date: Sat Apr 26 23:30:21 2014 +0200

some cleanup ...

commit c2382339d2a352c4beb6ec31b8dc9397dbf8f317
Author: Martin Felke <[email protected]>
Date: Sat Apr 26 23:21:00 2014 +0200

all "optimizations" made it actually slower, so using full copy now...

commit 26d7665c097fa02e0c26e8476854f09f97970704
Author: Martin Felke <[email protected]>
Date: Sat Apr 26 22:13:07 2014 +0200

hrm bisect does not get faster...

commit 4ab0f421a7e64db03ae474d3e6ddf30020e2cd56
Author: Martin Felke <[email protected]>
Date: Sat Apr 26 18:26:12 2014 +0200

attempt to accelerate bisect fracture, but no real success...

commit 8d20bf15c5f2da9896a56a1332b20aff194ccf8c
Author: Martin Felke <[email protected]>
Date: Thu Apr 24 11:12:39 2014 +0200

mac does not support memorystreams (fmemopen and open_memorystream) as well... using regular file there too

commit f487116c3261ebed85ec3d52506d1124f6f330d5
Author: Martin Felke <[email protected]>
Date: Thu Apr 24 09:52:39 2014 +0200

was merged incorrectly as well...

commit 5208108373becb9c2a715fc89032f643bcb22e6a
Author: Martin Felke <[email protected]>
Date: Thu Apr 24 01:16:07 2014 +0200

those were merged incorrectly from and older branch, error was visible in windows. (crashes)

commit cef56428252b6af069ae64a232a5ccd1dc7a9a26
Author: Martin Felke <[email protected]>
Date: Thu Apr 24 00:53:56 2014 +0200

removed incorrect include stdbool.h

commit 3f879074787a6ac8d4c6077b910810ef2df3f957
Author: Martin Felke <[email protected]>
Date: Wed Apr 23 23:43:59 2014 +0200

argh, Windows did not support memorystreams, so had to add regular file as fallback

commit 9f34788ad63bfda009af70534a07ee95cd4e924b
Author: Martin Felke <[email protected]>
Date: Wed Apr 23 14:51:04 2014 +0200

memory leak hunting, there is still one unfixable related to customdata behavior (need to alloc twice there somehow, grr...)

commit 9831a6b3e253f691cda67f95be658b688b296448
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 20:21:16 2014 +0200

attempt to store fracture result and read it, failed, so deactivated for now

commit 74d486b56e28186ce1ae9bc3600f11aa4c861b1b
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 17:46:00 2014 +0200

fix for crash at removing modifier

commit 2c77a4da8c26d1b573b029157f84f20c071037cf
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 17:36:11 2014 +0200

fix : dont create meshislands for empty shards, causes trouble with rigidbody sim

commit b34d1f8f8bf84c4bc888566bc0f11aeb338d3550
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 15:10:12 2014 +0200

rigidbody should work without fracture now too

commit 6eb641b93a2afb04d5776e67c133883552a4889a
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 11:47:17 2014 +0200

some more crash fixes

commit 4777e746940e47eec3b61e13e055c0f62034677c
Author: Martin Felke <[email protected]>
Date: Tue Apr 22 02:17:42 2014 +0200

some fixes and a bit performance optimization

commit 2b718bda3f3cce54a4e8b91b7430a498168105f8
Author: Martin Felke <[email protected]>
Date: Mon Apr 21 22:58:41 2014 +0200

small crash fix in case fracturing goes wrong (sometimes 0 shards...)

commit 6d27993ad8192d38a487009cd75714c835483f07
Author: Martin Felke <[email protected]>
Date: Mon Apr 21 22:41:44 2014 +0200

removed temporary material coloring of clusters and added support for uvs (boolean)

commit 90d22621f55019d6b1e7a69b30fda9b3264d49d3
Author: Martin Felke <[email protected]>
Date: Mon Apr 21 13:55:44 2014 +0200

fix for saving and loading

commit fe9c308bb15d015b19946b04fefb195f0b30da9c
Author: Martin Felke <[email protected]>
Date: Mon Apr 21 00:46:50 2014 +0200

sim should work again now

commit 22dea61d559b58286529ff841f4c8507e3682618
Author: Martin Felke <[email protected]>
Date: Sun Apr 20 18:28:18 2014 +0200

hopefully simulation fixes...

commit 0aa4f1d594d51e7f95fa0423a7d14adc7aab98e3
Author: Martin Felke <[email protected]>
Date: Sun Apr 20 15:37:48 2014 +0200

compile fixes...

commit 462f1436c3cf0a49136c4fb4c67eef5e7648580f
Merge: 1972f7b 30467f8
Author: Martin Felke <[email protected]>
Date: Sun Apr 20 14:43:14 2014 +0200

Merge branch 'refs/heads/rigid_fracture' into fracture_modifier_oldsim

Conflicts:
extern/CMakeLists.txt
extern/voro++/CMakeLists.txt
extern/voro++/src/Doxyfile
extern/voro++/src/c_interface.cc
extern/voro++/src/c_interface.hh
extern/voro++/src/c_loops.hh
extern/voro++/src/container.cc
extern/voro++/src/container.hh
extern/voro++/src/container_prd.hh
extern/voro++/src/wall.cc
extern/voro++/src/worklist_gen.pl
intern/rigidbody/RBI_api.h
release/scripts/startup/bl_ui/properties_physics_softbody.py
source/blender/blenkernel/BKE_rigidbody.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/keyframing.c
source/blender/editors/armature/armature_edit.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mask/mask_ops.c
source/blender/editors/mask/mask_select.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fracture.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_util.c
source/blender/windowmanager/intern/wm_event_system.c
source/blenderplayer/CMakeLists.txt

commit 1972f7bd01b14ef39a901b0194e03583471fc0aa
Author: Martin Felke <[email protected]>
Date: Sun Apr 20 12:41:40 2014 +0200

clustering for fracture

commit 7bb6bf21d2313a626797937b06af150fa326c94a
Author: Martin Felke <[email protected]>
Date: Thu Apr 17 12:13:19 2014 +0200

added point sources and seed

commit f49ddd310d9997e4ee0b4e033fc8115a0f833b65
Author: Martin Felke <[email protected]>
Date: Wed Apr 16 13:25:56 2014 +0200

bisect fix, geometry disappeared before

commit 35e4e8a4fdec39e30cb83faf3708aaa11a0cba6c
Author: Martin Felke <[email protected]>
Date: Wed Apr 16 12:18:52 2014 +0200

missing brace caused compile errors...

commit 15f50655e88aed53e56fbcb0f88a4d11ac7b6d8b
Author: Martin Felke <[email protected]>
Date: Wed Apr 16 11:20:05 2014 +0200

fixing compile....

commit a04214d1074c15037f88f360ef68fd19594c35d2
Merge: cc8bb23 d050577
Author: Martin Felke <[email protected]>
Date: Wed Apr 16 11:05:38 2014 +0200

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
extern/carve/carve-capi.cc
extern/carve/carve-capi.h
extern/carve/carve-util.cc
extern/carve/carve-util.h
extern/carve/patches/series
intern/bsp/intern/BSP_CSGException.h
release/datafiles/locale
source/blender/blenkernel/BKE_mesh.h
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesrna/intern/rna_fracture.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.h

commit cc8bb235b909520608b46c271125edb2cc8a3e31
Author: Martin Felke <[email protected]>
Date: Wed Apr 16 10:32:24 2014 +0200

pick attempts, fail

commit 82285878f475358d4d396dfcc7f7682e724c33bb
Author: Martin Felke <[email protected]>
Date: Sun Feb 9 13:53:36 2014 +0100

stuck / failing attempt for picking shards :(

commit de70b4e31771e0243a78e1db4326f56b31e5ad00
Author: Martin Felke <[email protected]>
Date: Sun Feb 9 12:40:50 2014 +0100

added (empty) fracture edit mode

commit e15f781ffd2565622d60b0463dd1724fd66ff2ab
Author: Martin Felke <[email protected]>
Date: Fri Feb 7 10:56:05 2014 +0100

integrated latest crash fix (empty mesh at union operands) from sergey

commit 413a80f966237fe08392a15629e8d6d176d6dd04
Author: Martin Felke <[email protected]>
Date: Thu Feb 6 11:06:34 2014 +0100

small typo fix from sergeys patch

commit af818d32b3f7da9716f77ecff03a6e6e6b142ca5
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 19:27:58 2014 +0100

Better handling of flipped face normals coming from voro++.

Instead of flipping the normals on the derived mesh, produce the face
loops in the correct order for shards.

commit 5b4caa03ac7a61320dc6fd3f03aace5ba922f1f7
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 18:51:48 2014 +0100

Allow the fracture modifier to apply in editmode.

commit 0daab1ef32fbf0d8ab23f484b13981be6fe5f01b
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 18:09:58 2014 +0100

Fix for last terminator in voro++ output: this is just a single char.

commit 310514c14eefd1e9be23d53d21d4cebc68fbe648
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 17:57:52 2014 +0100

Simplified neighbor parsing from voro++ output.

Number of neighbors is exactly the same as number of faces - each face
has one neighbor. Moved this into the face section of voro++ output too,
since it's essentially face data.

commit d20aec59bd4801ef051b5ac8e07bcc8a9f9dc70c
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 17:16:59 2014 +0100

Fix for voro++ output parsing.

Use available print options from voro++ to get number of verts and loops
in advance, to avoid realloc. Also fixed bad mesh results with missing
vertices.

commit a3b452d752de1c02a80cd4894911bfdf7039a06c
Author: Lukas Tönne <[email protected]>
Date: Wed Feb 5 16:00:05 2014 +0100

Removed old dummy code for fracture.

commit 9ca13f6e0ee08b103ff8ecd90bac552dfb04a379
Author: Lukas Tönne <[email protected]>
Date: Tue Feb 4 19:05:44 2014 +0100

Added fracture_util.h to keep internal utility function declarations
out of the actual blenkernel header.

commit 2befce02af65ddc860158029625db0076b5e7b15
Author: Martin Felke <[email protected]>
Date: Tue Feb 4 20:37:01 2014 +0100

a bit reduction of allocs, but still needed for loops (cant determine loop count fast / reliable for now in advance)

commit cbe0972d992cbe96ceda1a933e2fc0712d2cd822
Author: Martin Felke <[email protected]>
Date: Tue Feb 4 13:54:17 2014 +0100

fix attempt for boolean

commit 063d438054618779501ce923d5784c2ceb747fbe
Author: Lukas Tönne <[email protected]>
Date: Tue Feb 4 09:07:26 2014 +0100

Use a memstream again instead of a temporary file. But to avoid crappy
performance when directly parsing the stream, use a read-only string
stream afterward to do the actual parsing on the resulting char buffer.

commit bf59c1bc662324f149fb7c05f97641f12269349e
Author: Lukas Tönne <[email protected]>
Date: Tue Feb 4 08:54:12 2014 +0100

Use void argument to avoid compiler warning.

commit 40fb7592f9c47f58d17a8e1177eadc055789a6b4
Author: Lukas Tönne <[email protected]>
Date: Mon Feb 3 13:25:42 2014 +0100

Applied diffs 837 and 838 from D274.

commit 165bfecbc160efeb995fb5d105852502be4a04c2
Merge: e66d3e5 9bec4f7
Author: Lukas Tönne <[email protected]>
Date: Mon Feb 3 12:39:30 2014 +0100

Merge branch 'master' into fracture

commit e66d3e5d0cafcecd12deb656771947931fef7720
Merge: 9675ba1 15bb397
Author: Lukas Tönne <[email protected]>
Date: Mon Feb 3 11:56:42 2014 +0100

Merge branch 'arcpatch-D274' into fracture

Conflicts:
extern/carve/carve-util.h
intern/bsp/extern/CSG_BooleanOps.h
intern/bsp/intern/BOP_CarveInterface.cpp

commit 9675ba189fbc2bec341c082ef7dd40d4ace34851
Merge: 4aeb8ea 37381ef
Author: Lukas Tönne <[email protected]>
Date: Mon Feb 3 11:39:03 2014 +0100

Merge branch 'master' into fracture

The previous master merge was squashed, this has been reverted to avoid
unnecessary conflicts.

Conflicts:
extern/carve/patches/series

commit 4aeb8ea28fbedc5d7b8678d5ebde669aac8b19e4
Author: Lukas Tönne <[email protected]>
Date: Mon Feb 3 11:37:38 2014 +0100

Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into boolean_fracture"

This reverts commit ecc10dbe29280b33a5cbfc95274ce0287d99b0e0.

commit 15bb397fbbf619433152ee91ecd0fea4a3ded5ee
Author: Sergey Sharybin <[email protected]>
Date: Mon Feb 3 10:50:01 2014 +0100

Rework carve integration into boolean modifier

Goal of this commit is to support NGons for boolean modifier
(currently mesh is being tessellated before performing boolean
operation) and also solve the limitation of loosing edge custom
data layers after boolean operation is performed.

Main idea is to make it so boolean modifier uses Carve library
directly via it's C-API, avoiding BSP intermediate level which
was doubling amount of memory needed for the operation and which
also used quite reasonable amount of overhead time.

Reviewers: lukastoenne, campbellbarton

CC: scorpion81, karja, jsm

Differential Revision: https://developer.blender.org/D274

commit c7a3a79da14bd4d7f927b91127d6da453882ca8a
Author: Martin Felke <[email protected]>
Date: Sun Feb 2 20:30:03 2014 +0100

new boolean patch by sergey and small fracture bisect fix (need unity_m4 obmat instead of ob->obmat)

commit ecc10dbe29280b33a5cbfc95274ce0287d99b0e0
Author: Martin Felke <[email protected]>
Date: Sat Feb 1 15:53:38 2014 +0100

Merge remote-tracking branch 'refs/remotes/origin/master' into boolean_fracture

Conflicts:
extern/carve/patches/series

commit 56beb2effe0290d669351a2723b542a81b52a4c3
Author: Martin Felke <[email protected]>
Date: Sat Feb 1 15:24:02 2014 +0100

testing new boolean patch, CRASH ! in intersect.cpp, line 438 from carve

commit c2edd4cf8cf2582e98afada8192b6f0401ce7dc7
Author: Martin Felke <[email protected]>
Date: Sat Feb 1 13:11:52 2014 +0100

memory leaks fixed

commit fe93f08d57ad722b63f5648e30028623017dcd87
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 23:31:56 2014 +0100

made fill optional with bisect

commit 94c111072bea4a69e0fb1352cd400634f126e1fd
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 22:12:58 2014 +0100

tested different bisect fill algorithms; triangle fill on triangulated input turns out to be best

commit ae25dc66df6729336cacbed16db78efbb1c61a1d
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 19:33:00 2014 +0100

changed memorystream back to real file, what a performance boost !

commit 0de34dcda16efb514e92808b4a57fec2ac608159
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 18:10:24 2014 +0100

added shard count / shard id to gui, tested performance, its very lousy compared to my earlier modifiers

commit cd6a1f503aef9ccbd699a0fa5a7eb3816d867aa1
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 12:50:55 2014 +0100

made fracture algorithm selectable

commit 87f2b86cd819ad2f8990512e6ebbaa32f014556d
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 12:23:25 2014 +0100

added bisect as second fracture algorithm

commit bffce8c7270897e919b2e0c03df15e9698a86b61
Author: Martin Felke <[email protected]>
Date: Fri Jan 31 10:08:38 2014 +0100

tiny fix, boolean works without flipping the loops as well (except suzanne)

commit c20718e9d59ceab6dc694b0434ef096d4087a32c
Author: Martin Felke <[email protected]>
Date: Thu Jan 30 22:36:28 2014 +0100

boolean fracture works ! (atleast partially, suzanne produces still errors)

commit 5f8997a7a4d34a202555eee9dd8d4d29a6b7041b
Author: Martin Felke <[email protected]>
Date: Thu Jan 30 21:03:11 2014 +0100

still a "negative" result, somewhere the normals need to be flipped, but how ??

commit 98e0ec48507be6bb8a191d5f89cb488512542f68
Author: Martin Felke <[email protected]>
Date: Thu Jan 30 19:08:35 2014 +0100

Merge branch 'refs/heads/boolean_fracture' into fracture

Conflicts:
intern/bsp/extern/CSG_BooleanOps.h
intern/bsp/intern/BOP_CarveInterface.cpp

commit 2993b02b8e505520de4017173a5c07afdaa6082a
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 23:56:30 2014 +0100

some fix attempts for flipping the face orientation, fail...

commit 653a951ea3da6b94129d4ba465539c5723ef25bc
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 22:53:32 2014 +0100

first attempt of direct communication between blender<->carve layer and fracmesh, fail because normals are inverted....

commit b257850ce2408e1f947fa1827e173337bcc72292
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 13:48:05 2014 +0100

saving fracture to blend and loading from it

commit de2e6a7004b0c322dd5d920793b849ee49e81476
Author: Lukas Tönne <[email protected]>
Date: Sun Jan 26 12:05:15 2014 +0100

Removed the vertco member in Shard, this was previously used for
simulation but is not needed any longer.

commit 98ae9b083bd3f76ee300440422d4478e21502e96
Author: Lukas Tönne <[email protected]>
Date: Sun Jan 26 11:58:09 2014 +0100

Extended the BKE_create_fracture_shard funktion with a 'copy' argument,
so we can pass over arrays without having to do double alloc.

commit dd278f6a502a46f44edc42b28b88c31e41102ab4
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 11:50:29 2014 +0100

some memory leaks fixed, but some left, and attempt for writefile

commit 57f8d0721fb4ac1c4b86a9e82ffd582e2094cfc3
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 11:13:26 2014 +0100

parsing and createdm makes valid mesh now

commit d1393032a2ab70768b5a09b724f373e9da9979c6
Author: Martin Felke <[email protected]>
Date: Sun Jan 26 01:42:17 2014 +0100

parsing of voro++ data should work now, but a crappy mesh appears, hmm

commit 7ff93f27ea0c6e0ebaa918aa912ddb3e610129cb
Author: Martin Felke <[email protected]>
Date: Sat Jan 25 23:36:03 2014 +0100

attempt to parse voro++ data from string, not working yet

commit ca0b5ca635eea4efa6b3e2b34cf19142104c402c
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 20:41:03 2014 +0100

Fix for point cloud construction: Use a point struct to avoid difficult
float arrays.
Also added Frac prefixes to prevent potential name collisions.

commit 64e9066f4f9ae3abfd4bcaf6b65c3789e29033d1
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 20:29:13 2014 +0100

A few small fixes for the voro++ C API, which seem to have fixed a
freezing issue when building with clang.

Also min/max initialization for point cloud construction.

commit f91218cbdfad54e7c18554fb18655813d44db6c8
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 20:02:03 2014 +0100

cmake cleanup: removed the ++ suffix from VORO cmake variables and
defines.

commit a511e86ebfabe40b90b07cbc807f63e56d666718
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 19:26:05 2014 +0100

Stub code for voro++ integration.

Not functional yet, but needs testing for potential voro++ bug.

commit 34c07eed517279e84f092a900310defcc9ee38d9
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 17:28:53 2014 +0100

Removed the ShardList return value of the fracture function.

This is not used atm and it's a bit ugly to return such allocated
values. If necessary this can be added back later.

commit f86d71b02519fc0dcc375c656cc9cf27899a8b7c
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 16:29:58 2014 +0100

Updated the pseudo-fracture method to new Mesh types.

commit 3c310d565a847ec25f4944fc4977b2339ba97f1d
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 15:52:31 2014 +0100

New method for constructing the DerivedMesh for the fracture modifier.
Uses a simple union of all the shard mesh data.

commit f5e624aaad68658023553f1e825c88f3499494db
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 15:23:31 2014 +0100

Create the initial fracmesh geometry by copying the input DerivedMesh
as a single shard.

commit fa1ace9f2dd503d3604ce2ebadedbe96fa204ac9
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 15:03:08 2014 +0100

Removed the BMesh reference from FracMesh.
With the new Mesh data types this will no longer be needed.

commit 5c21d96e5c6a8114ceade5d77bff1668b660054c
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 14:36:30 2014 +0100

Use plain Mesh types (MVert, MPoly, MLoop) in shards instead of copying
BMesh element arrays.

This will make Shard work more like a mini-Mesh struct and allow storing
of mesh data in blend files.

Larger construction methods currently disabled, TODO.

commit 77cfd4e2f8aef14025f7cff928f840be4405d51c
Author: Lukas Tönne <[email protected]>
Date: Sat Jan 25 13:43:55 2014 +0100

Partial revert of previous commit: DerivedMesh should be released by
setting needsFree and then calling dm->release.

commit 414352fced167a2fc169b344751a871af40d9a0e
Author: Martin Felke <[email protected]>
Date: Sat Jan 25 13:24:06 2014 +0100

fixed majority of memory leaks (of fracture)

commit 090016f9d1aef7801ca546887d7e4037781d1dd0
Author: Lukas Tönne <[email protected]>
Date: Fri Jan 24 17:15:22 2014 +0100

Moved the render_mesh DerivedMesh from FracMesh into the
FractureModifierData.

This keeps the derived mesh inside the modifier system and is more
in line with common principles in other modifiers.

Also did lots of style cleanup.

commit 7e50455b8dc1f80ee1da54c01b82dc2ca81fb774
Author: Martin Felke <[email protected]>
Date: Sat Jan 18 22:01:24 2014 +0100

basic foundation for fracture modifier / operator laid; todo fix memoryleaks...

commit d832011b820a0ece06cbcec0d79bacf9985a22d6
Author: Martin Felke <[email protected]>
Date: Sat Jan 18 15:23:18 2014 +0100

modifier initial setup

commit c0907a6aa73557aa110c36cbc5e08c2b0cd5f45c
Author: Martin Felke <[email protected]>
Date: Sat Jan 18 10:30:57 2014 +0100

initial commit for new fracture system

commit 30467f8e5c0525f7a48d6f4736d1c68f0d875a9a
Author: Thomas Beck <[email protected]>
Date: Mon Nov 25 21:44:19 2013 +0100

Code cleanup: As Sergey stated on bf-committers one should use id_us_min() if the user counter has to be decremented and not decrement the counter by hand.

commit 3f8bd4fe15e475be214a858fee3173c7c758aa3e
Author: Campbell Barton <[email protected]>
Date: Tue Nov 26 07:13:34 2013 +1100

Correct fix for T37617, (own recent regression)

commit 375b6f5a57957f2a7250f2233e7433b062474ac4
Author: Bastien Montagne <[email protected]>
Date: Mon Nov 25 21:01:22 2013 +0100

Fix T37617: "Add plane" was adding a 2*2 grid

Was a regression from rBaa3c06b41ca9, hope this time all things are OK again (note the X/Y subdivision values still are different than before (-1 for same result), but imho they make more sense this way).

commit 3f661c6355c80df99db1bdcb0d3e93143baebaf0
Author: Campbell Barton <[email protected]>
Date: Tue Nov 26 06:39:14 2013 +1100

Code Cleanup: rename vars for detecting change to be more consistent

rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.

commit a3050d4b2d6ca6ffbb2262af6a9bdb89ff4a5efd
Author: Martin Felke <[email protected]>
Date: Sun Nov 10 20:01:52 2013 +0100

fix: marking edges as sharp in modifier did not work any more

commit f3007c42fc048e6ea1a96f11f1d0ec3b7a11e4fd
Author: Martin Felke <[email protected]>
Date: Sat Oct 26 11:57:46 2013 +0200

partial fix for fracturing meshes where origin is not in bounds center

commit c1ae472a10adca2335c2d3fd77996e1cec67228c
Author: Martin Felke <[email protected]>
Date: Fri Oct 25 23:29:53 2013 +0200

some hacks to keep baked files with clipping working...

commit f6b0828870c32244541a2795e3640c9c3f0a2434
Author: Martin Felke <[email protected]>
Date: Fri Oct 25 20:34:05 2013 +0200

hopefully fixed atleast the fracture with text converted to mesh/remeshed and objects whose origin is not at bounds center

commit 81fb6d526102d425597dd9514d2d93ab033d3e2d
Author: Martin Felke <[email protected]>
Date: Fri Oct 25 13:31:05 2013 +0200

changed (i think corrected) the centroid calculation for fractured objects with boolean

commit b7a772f56796b35445d1fa31f0dd898d18b22feb
Author: Martin Felke <[email protected]>
Date: Fri Oct 25 12:12:39 2013 +0200

fixing crash at refreshing fractured text, cause was improper handling of the necessary temp object for boolean function (yuck)

commit d612fd67b469dcd6c6ecc0ca4223bb43b17862db
Author: Martin Felke <[email protected]>
Date: Thu Oct 24 15:02:47 2013 +0200

attempt to make text and curves work with rigidbody modifiers too, still failing (flying apart... crashes...)

commit 8d25904e520920ad2e6fe40c88f9c6067045581c
Author: Martin Felke <[email protected]>
Date: Mon Sep 23 21:17:51 2013 +0200

fix for autorefresh and depgraph callback, strangely did only work for the testblend and not for others...

commit fb6afeedce7c2729f94717160d5133b0af1617d2
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 16:55:27 2013 +0200

using direct function for dissolve in object conversion too

commit d58cbd01ddd7d15a523ce30a78f6356a8d6b2106
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 16:39:30 2013 +0200

using dissolve function now directly to circumvent (hopefully) the va_arg problems under windows

commit 29766b78c3084b21b0d0a98d124f365ba864be60
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 16:38:40 2013 +0200

cosmetical update in gui

commit f35868f1b30d64775aa856530d79901a7eeb90be
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 14:08:40 2013 +0200

fix for use_animation and no autorefresh, mesh was reset to initial state always...

commit 75bd4dabbe2a232c8ce2b2867f2e462e06ab2d08
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 09:48:07 2013 +0200

making ngons in boolean case now too

commit a926f7afe74e0380452fc033a8040dfd6fb3ec6e
Author: Martin Felke <[email protected]>
Date: Sun Sep 22 09:38:54 2013 +0200

attempt to fix strange misbehavior of va_list / va_arg under windows by passing it as pointer to BM_op_vinitf instead of as value

commit 7e0258de362682f1ce1bb5275b015b17c47ba5a1
Author: Martin Felke <[email protected]>
Date: Sat Sep 21 23:01:02 2013 +0200

using bool variables (true, false) instead of int TRUE/FALSE now

commit 0a62a7f52df967456dc8c3c404ee3c6ddb0279d5
Author: Martin Felke <[email protected]>
Date: Sat Sep 21 22:15:58 2013 +0200

making real ngons in convert to object as well now

commit e62419008f04ac7c68b3c2d4b9ee1eebc7a51b03
Author: Martin Felke <[email protected]>
Date: Sat Sep 21 00:19:06 2013 +0200

added depgraph callback for autorefresh

commit 0bd32da1746634d28e9a7a10b365adefeba374b5
Author: Martin Felke <[email protected]>
Date: Fri Sep 20 21:55:49 2013 +0200

crash fix and graphical error fix when rigidbody modifier is used with autorefresh, for now must disable autorefresh manually to make sim work again

commit 91d018bb7612cc590e7e3c00cc399d2a3d3f4219
Author: Martin Felke <[email protected]>
Date: Fri Sep 20 21:02:39 2013 +0200

added autorefresh for explode modifier and particle selection mask (still crashing with rigidbody modifier attached, hmm)

commit ac6b1d923dd7d44f044d8488a69e3ed4a6377cce
Author: Martin Felke <[email protected]>
Date: Tue Sep 17 20:15:10 2013 +0200

added solver iterations override and proportional solver iterations options

commit 80f71bf21cc0dce1ba3ef72bf4321242bb309398
Author: Martin Felke <[email protected]>
Date: Tue Sep 17 08:05:26 2013 +0200

dont convert unnecessarily in clipping mode as well

commit f718c1cdbe88ecdf1a98e3f6a2b5b4a425787bf4
Author: Martin Felke <[email protected]>
Date: Tue Sep 17 01:41:43 2013 +0200

fixes for making explode "applyable" again, did not work anymore

commit 6b7ab62c940737ca829308cfe136541c3683dead
Author: Martin Felke <[email protected]>
Date: Tue Sep 17 00:15:45 2013 +0200

increased cache playback speed by atleast 10fps (from 14 to 24 in a 5000 shard testcube) by eliminating unnecessary bmesh conversions in explode modifier

commit 70e1988a1c0dee81784f1dc58f90bfde97080b3b
Author: Martin Felke <[email protected]>
Date: Mon Sep 16 17:25:12 2013 +0200

some attempt to reduce memory usage, but no luck, hrm.

commit d76ead8e13f51199cc2ab763fd73ef1363068a39
Author: Martin Felke <[email protected]>
Date: Mon Sep 16 13:14:29 2013 +0200

fix for null-pointer crash when attempting to create a cached derivedmesh from nonexistent bmesh

commit ab4ddd008fed5300156125558601019ed5e8fa0e
Author: Martin Felke <[email protected]>
Date: Sun Sep 15 10:59:45 2013 +0200

free vertices_cached if present before re-allocating -> prevent memory leak

commit 3be53ebfde4e2727381f613ba164d1345f116982
Author: Martin Felke <[email protected]>
Date: Sun Sep 15 10:35:46 2013 +0200

init explode modifier right after addition

commit 1291b546169f7a0aa04fb35a8e59cdd67d72f0f6
Author: Martin Felke <[email protected]>
Date: Sun Sep 15 10:20:08 2013 +0200

changed visible mesh to derivedmesh, some performance gain, but still need to copy it in modifier

commit 1de7452ba5449ec6f2394fb397f9c74909b963e6
Author: Martin Felke <[email protected]>
Date: Sat Sep 14 10:05:23 2013 +0200

made parenting to empty default, it also cleans up the outliner a bit, so removed the 2nd operator button and the operator property again, was confusing

commit 6f6bf095d68549ab47d2f8faf9d1218f500453c2
Author: Martin Felke <[email protected]>
Date: Fri Sep 13 20:59:27 2013 +0200

added "convenience" support for blender destructability editor -> convert with parenting, usable together with addon in "Loose Parts" mode

commit a584f90abcde8aff3797541b9212c498833a7a9c
Author: Martin Felke <[email protected]>
Date: Fri Sep 13 12:05:13 2013 +0200

crash fix for bake to keyframes

commit b95df881afd98e2ef84fde1cd53e67d9c2ab2947
Author: Martin Felke <[email protected]>
Date: Fri Sep 13 12:04:51 2013 +0200

partial crash fix for outer constraints, convert to objects takes mass / dist dependent thresholds into account now

commit 353892bb144fd434de5f6d2fa1f17e470a9393a4
Author: Martin Felke <[email protected]>
Date: Wed Sep 11 11:25:51 2013 +0200

better refresh manually after duplicating objects with modifiers

commit 728db50b656285e89937a50c6cd1fb9f115c6994
Author: Martin Felke <[email protected]>
Date: Tue Sep 10 20:28:49 2013 +0200

some (failing) attempts to fix boolean intersection (often has "inverted" results)

commit a4f7e80d76ec26a4cb023e59e4b160ea462674cf
Author: Martin Felke <[email protected]>
Date: Tue Sep 10 16:56:37 2013 +0200

remove gitignore files from commits

commit 9c9e8808c2372327c235cec71bb238653973b454
Author: Martin Felke <[email protected]>
Date: Tue Sep 10 10:25:47 2013 +0200

making ngons and marking edges as sharp for object convert operator

commit 29d8e09c4cc6348161ee69437e22008b9fd0e240
Author: Martin Felke <[email protected]>
Date: Tue Sep 10 00:20:06 2013 +0200

another attempt to fix baking, doesnt show negative side effects up to now

commit 7d320da003c2c81c30dc02c34633b6542a46e6ff
Author: Martin Felke <[email protected]>
Date: Tue Sep 10 00:12:20 2013 +0200

fix for baking regular rigidbodies, (hopefully)

commit 48e8faeac91a27e54b9a8836c343e60861229616
Author: Martin Felke <[email protected]>
Date: Mon Sep 9 18:54:00 2013 +0200

hide the constraint empties after bake to keyframes, make sure you select the constraints as well prior to bake to keyframes or blender crashes afterwards (because of stray co