[Bf-blender-cvs] [ce3cae8] master: [msvc2015] Fix cmake warnings regarding backslashes in path of the run-time libraries

[lazydodo]

Commit: ce3cae81f67243b6d87d32c14dc84be57c969026
Author: lazydodo
Date:   Sat Nov 26 17:00:25 2016 -0700
Branches: master
https://developer.blender.org/rBce3cae81f67243b6d87d32c14dc84be57c969026

[msvc2015] Fix cmake warnings regarding backslashes in path of the run-time 
libraries

===

M   source/creator/CMakeLists.txt

===

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index aa0a213..04a79f6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1185,7 +1185,7 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
message(FATAL_ERROR "Windows 10 SDK directory 
not found")
endif()
endif()
-   
+   FILE(TO_CMAKE_PATH  ${KITSPATH} KITSPATH)
install(
FILES
${KITSPATH}/api-ms-win-core-file-l1-2-0.dll

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [d464a7c] master: fix T50118: Added missing assignment of Bone Roll

[Gaia Clary]

Commit: d464a7c4418608baae4946429c16a2925aed4ba7
Author: Gaia Clary
Date:   Sat Nov 26 18:48:50 2016 +0100
Branches: master
https://developer.blender.org/rBd464a7c4418608baae4946429c16a2925aed4ba7

fix T50118: Added missing assignment of Bone Roll

===

M   source/blender/collada/ArmatureImporter.cpp

===

diff --git a/source/blender/collada/ArmatureImporter.cpp 
b/source/blender/collada/ArmatureImporter.cpp
index ae43c0a..17334ca 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -169,6 +169,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, 
COLLADAFW::Node *node, EditBon
float angle;
mat4_to_loc_rot_size(loc, rot, size, mat);
mat3_to_vec_roll(rot, NULL, );
+   bone->roll = angle;
}
copy_v3_v3(bone->head, mat[3]);
add_v3_v3v3(bone->tail, bone->head, tail); //tail must be non zero

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [1eabe30] fracture_modifier: stability fix for dynamic fractal, use triangulated cutter planes now and ensure they go through the shard's centroid

[Martin Felke]

Commit: 1eabe30d34429ac45259f2cabd1ad2930265cfbd
Author: Martin Felke
Date:   Sat Nov 26 11:47:10 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rB1eabe30d34429ac45259f2cabd1ad2930265cfbd

stability fix for dynamic fractal, use triangulated cutter planes now and 
ensure they go through the shard's centroid

===

M   source/blender/blenkernel/intern/fracture.c
M   source/blender/blenkernel/intern/fracture_util.c

===

diff --git a/source/blender/blenkernel/intern/fracture.c 
b/source/blender/blenkernel/intern/fracture.c
index ddbf4f3..7958c44 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -546,13 +546,14 @@ static void handle_fast_bisect(FracMesh *fm, int 
expected_shards, int algorithm,
}
 }
 
-static void handle_boolean_fractal(Shard* s, Shard* t, int expected_shards, 
DerivedMesh* dm_parent, Object *obj, short inner_material_index,
+static void handle_boolean_fractal(Shard* p, Shard* t, int expected_shards, 
DerivedMesh* dm_parent, Object *obj, short inner_material_index,
int num_cuts, float fractal, int 
num_levels, bool smooth,int parent_id, int* i, Shard ***tempresults,
DerivedMesh **dm_p, char uv_layer[64], int 
solver, int thresh)
 {
/* physics shard and fractalized shard, so we need to booleanize twice 
*/
/* and we need both halves, so twice again */
Shard *s2 = NULL;
+   Shard *s = NULL;
int index = 0;
int max_retries = 3;
 
@@ -574,9 +575,10 @@ static void handle_boolean_fractal(Shard* s, Shard* t, int 
expected_shards, Deri
BKE_object_dimensions_get(obj, size);
radius = MAX3(size[0], size[1], size[2]);
 
-   loc[0] = (BLI_frand() - 0.5f) * size[0];
+   /*loc[0] = (BLI_frand() - 0.5f) * size[0];
loc[1] = (BLI_frand() - 0.5f) * size[1];
-   loc[2] = (BLI_frand() - 0.5f) * size[2];
+   loc[2] = (BLI_frand() - 0.5f) * size[2];*/
+   copy_v3_v3(loc, p->centroid);
 
eul[0] = BLI_frand() * M_PI;
eul[1] = BLI_frand() * M_PI;
@@ -642,7 +644,7 @@ static void handle_boolean_fractal(Shard* s, Shard* t, int 
expected_shards, Deri
 static bool handle_boolean_bisect(FracMesh *fm, Object *obj, int 
expected_shards, int algorithm, int parent_id, Shard **tempshards,
   DerivedMesh *dm_parent, BMesh* bm_parent, 
float obmat[4][4], short inner_material_index, int num_cuts,
   int num_levels, float fractal, int *i, bool 
smooth, Shard*** tempresults, DerivedMesh **dm_p, char uv_layer[64],
-  KDTree *preselect_tree, int solver, int 
thresh)
+  KDTree *preselect_tree, int solver, int 
thresh, Shard* p)
 {
Shard *s = NULL, *t = NULL;
if (fm->cancel == 1)
@@ -667,7 +669,7 @@ static bool handle_boolean_bisect(FracMesh *fm, Object 
*obj, int expected_shards
s = BKE_fracture_shard_boolean(obj, dm_parent, t, 
inner_material_index, 0, 0.0f, NULL, NULL, 0.0f, false, 0, uv_layer, solver, 
thresh);
}
else if (algorithm == MOD_FRACTURE_BOOLEAN_FRACTAL) {
-   handle_boolean_fractal(s, t, expected_shards, dm_parent, obj, 
inner_material_index, num_cuts, fractal,
+   handle_boolean_fractal(p, t, expected_shards, dm_parent, obj, 
inner_material_index, num_cuts, fractal,
   num_levels, smooth, parent_id, i, 
tempresults, dm_p, uv_layer, solver, thresh);
}
else if (algorithm == MOD_FRACTURE_BISECT || algorithm == 
MOD_FRACTURE_BISECT_FILL) {
@@ -977,14 +979,14 @@ static void parse_cells(cell *cells, int expected_shards, 
ShardID parent_id, Fra
for (i = 0; i < expected_shards; i++)   {
handle_boolean_bisect(fm, obj, expected_shards, 
algorithm, parent_id, tempshards, dm_parent,

bm_parent, obmat, inner_material_index, num_cuts, num_levels, fractal,
-   
, smooth, , _p, uv_layer, preselect_tree, solver, thresh);
+   
, smooth, , _p, uv_layer, preselect_tree, solver, thresh, p);
}
}
else {
for (i = 0; i < expected_shards; i++)   {
handle_boolean_bisect(fm, obj, expected_shards, 
algorithm, parent_id, tempshards, dm_parent,

bm_parent, obmat,