[Bf-blender-cvs] [172f30d] temp-modifier-deltamush-experimental: Edit modifier defaults
Campbell Barton
noreply at git.blender.org
Mon Mar 30 16:54:59 CEST 2015
Commit: 172f30dcc3939d3c0e2dd3ed1c3a64b50129fd4d
Author: Campbell Barton
Date: Tue Mar 31 01:54:39 2015 +1100
Branches: temp-modifier-deltamush-experimental
https://developer.blender.org/rB172f30dcc3939d3c0e2dd3ed1c3a64b50129fd4d
Edit modifier defaults
===================================================================
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/modifiers/intern/MOD_correctivesmooth.c
===================================================================
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 4992805..f5edb55 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1295,14 +1295,14 @@ typedef struct CorrectiveSmoothModifierData {
/* positions set during 'bind' operator */
float (*positions)[3];
+ unsigned int positions_num;
float lambda;
- char defgrp_name[64]; /* MAX_VGROUP_NAME */
-
- unsigned int positions_num;
short repeat, flag;
char smooth_type, pad[3];
+ char defgrp_name[64]; /* MAX_VGROUP_NAME */
+
/* runtime-only cache (delta's between),
* delta's between the original positions and the smoothed positions */
float (*positions_delta_cache)[3];
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 0efc145..409f1f8 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -41,6 +41,7 @@
#include "BLI_strict_flags.h"
+
#define DEBUG_TIME
#include "PIL_time.h"
@@ -55,13 +56,17 @@ static void initData(ModifierData *md)
{
CorrectiveSmoothModifierData *dmmd = (CorrectiveSmoothModifierData *)md;
- dmmd->flag = MOD_CORRECTIVESMOOTH_PIN_BOUNDARY;
dmmd->positions = NULL;
dmmd->positions_num = 0;
- dmmd->positions_delta_cache = NULL;
+
dmmd->lambda = 0.5f;
dmmd->repeat = 5;
+ dmmd->flag = 0;
+ dmmd->smooth_type = MOD_CORRECTIVESMOOTH_SMOOTH_SIMPLE;
+
dmmd->defgrp_name[0] = '\0';
+
+ dmmd->positions_delta_cache = NULL;
}
More information about the Bf-blender-cvs
mailing list