[Bf-blender-cvs] [a0f15e0] temp_merge_gooseberry_hair: Minor fix for lost variable declaration during cherry-picking.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:50:19 CET 2015
Commit: a0f15e0ab6ab104857c2bbacb1d4d0a9c1fd0d17
Author: Lukas Tönne
Date: Mon Jan 19 19:14:25 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBa0f15e0ab6ab104857c2bbacb1d4d0a9c1fd0d17
Minor fix for lost variable declaration during cherry-picking.
===================================================================
M source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 7df58e0..153993d 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -116,7 +116,6 @@ void BKE_cloth_solver_set_positions(ClothModifierData *clmd)
unsigned int numverts = cloth->numverts, i;
ClothHairRoot *cloth_roots = clmd->roots;
Implicit_Data *id = cloth->implicit;
- const float ZERO[3] = {0.0f, 0.0f, 0.0f};
for (i = 0; i < numverts; i++) {
ClothHairRoot *root = &cloth_roots[i];
@@ -512,6 +511,7 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), ListB
float gravity[3] = {0.0f, 0.0f, 0.0f};
MFace *mfaces = cloth->mfaces;
unsigned int numverts = cloth->numverts;
+ ClothVertex *vert;
#ifdef CLOTH_FORCE_GRAVITY
/* global acceleration (gravitation) */
More information about the Bf-blender-cvs
mailing list