kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

SVN maintenance.

Browse Source
This commit is contained in:
Guillermo S. Romero 2011-09-09 00:46:00 +00:00
parent 4eb9b9e4f1
commit ae7401751c
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_modifier_types.h
View File

@ -818,7 +818,7 @@ typedef struct WeightVGEditModifierData {
int mask_tex_mapping; int mask_tex_mapping;
char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */
/* Padding… */ /* Padding... */
int pad_i1; int pad_i1;
} WeightVGEditModifierData; } WeightVGEditModifierData;
@ -863,7 +863,7 @@ typedef struct WeightVGMixModifierData {
int mask_tex_mapping; /* How to map the texture! */ int mask_tex_mapping; /* How to map the texture! */
char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */ char mask_tex_uvlayer_name[32]; /* Name of the UV layer. */
/* Padding… */ /* Padding... */
int pad_i1; int pad_i1;
} WeightVGMixModifierData; } WeightVGMixModifierData;

2
source/blender/modifiers/intern/MOD_weightvg_util.c
View File

@ -135,7 +135,7 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
MappingInfoModifierData t_map; MappingInfoModifierData t_map;
float (*v_co)[3]; float (*v_co)[3];
/* Use new generic get_texture_coords, but do not modify our DNA struct for it… /* Use new generic get_texture_coords, but do not modify our DNA struct for it...
* XXX Why use a ModifierData stuff here ? Why not a simple, generic struct for parameters ? * XXX Why use a ModifierData stuff here ? Why not a simple, generic struct for parameters ?
* What e.g. if a modifier wants to use several textures ? * What e.g. if a modifier wants to use several textures ?
* Why use only v_co, and not MVert (or both) ? * Why use only v_co, and not MVert (or both) ?

4
source/blender/modifiers/intern/MOD_weightvg_util.h
View File

@ -44,7 +44,7 @@ struct Tex;
/* /*
* XXX I'd like to make modified weights visible in WeightPaint mode, * XXX I'd like to make modified weights visible in WeightPaint mode,
* but couldn't figure a way to do this… * but couldn't figure a way to do this...
* Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)? * Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)?
* Or the WeightPaint mode code itself? * Or the WeightPaint mode code itself?
*/ */
@ -53,7 +53,7 @@ struct Tex;
* Util functions. * * Util functions. *
**************************************/ **************************************/
/* We cannot divide by zero (what a surprise…). /* We cannot divide by zero (what a surprise...).
* So if -MOD_WEIGHTVGROUP_DIVMODE_ZEROFLOOR < weightf < MOD_WEIGHTVGROUP_DIVMODE_ZEROFLOOR, * So if -MOD_WEIGHTVGROUP_DIVMODE_ZEROFLOOR < weightf < MOD_WEIGHTVGROUP_DIVMODE_ZEROFLOOR,
* we clamp weightf to this value (or its negative version). * we clamp weightf to this value (or its negative version).
* Also used to avoid null power factor. * Also used to avoid null power factor.

10
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@ -28,7 +28,7 @@
/* /*
* XXX I'd like to make modified weights visible in WeightPaint mode, * XXX I'd like to make modified weights visible in WeightPaint mode,
* but couldn't figure a way to do this… * but couldn't figure a way to do this...
* Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)? * Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)?
* Or the WeightPaint mode code itself? * Or the WeightPaint mode code itself?
*/ */
@ -211,13 +211,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
if (defgrp_idx < 0) if (defgrp_idx < 0)
return dm; return dm;
/* XXX All this to avoid copying dm when not needed… However, it nearly doubles compute /* XXX All this to avoid copying dm when not needed... However, it nearly doubles compute
* time! See scene 5 of the WeighVG test file… * time! See scene 5 of the WeighVG test file...
*/ */
#if 0 #if 0
/* Get actual dverts (ie vertex group data). */ /* Get actual dverts (ie vertex group data). */
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
/* If no dverts, return unmodified data… */ /* If no dverts, return unmodified data... */
if (dvert == NULL) if (dvert == NULL)
return dm; return dm;
@ -231,7 +231,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
/* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */ /* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */
if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) { if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) {
/* XXX Seems to create problems with weightpaint mode??? /* XXX Seems to create problems with weightpaint mode???
* I'm missing something here, I guess… * I'm missing something here, I guess...
*/ */
// DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */ // DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */
ret = CDDM_copy(dm); ret = CDDM_copy(dm);

12
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@ -28,7 +28,7 @@
/* /*
* XXX I'd like to make modified weights visible in WeightPaint mode, * XXX I'd like to make modified weights visible in WeightPaint mode,
* but couldn't figure a way to do this… * but couldn't figure a way to do this...
* Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)? * Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)?
* Or the WeightPaint mode code itself? * Or the WeightPaint mode code itself?
*/ */
@ -62,7 +62,7 @@ static float mix_weight(float weight, float weight2, char mix_mode)
#if 0 #if 0
/* /*
* XXX Don't know why, but the switch version takes many CPU time, * XXX Don't know why, but the switch version takes many CPU time,
* and produces lag in realtime playback… * and produces lag in realtime playback...
*/ */
switch (mix_mode) switch (mix_mode)
{ {
@ -258,13 +258,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
return dm; return dm;
} }
/* XXX All this to avoid copying dm when not needed… However, it nearly doubles compute /* XXX All this to avoid copying dm when not needed... However, it nearly doubles compute
* time! See scene 5 of the WeighVG test file… * time! See scene 5 of the WeighVG test file...
*/ */
#if 0 #if 0
/* Get actual dverts (ie vertex group data). */ /* Get actual dverts (ie vertex group data). */
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
/* If no dverts, return unmodified data… */ /* If no dverts, return unmodified data... */
if (dvert == NULL) if (dvert == NULL)
return dm; return dm;
@ -278,7 +278,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
/* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */ /* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */
if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) { if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) {
/* XXX Seems to create problems with weightpaint mode??? /* XXX Seems to create problems with weightpaint mode???
* I'm missing something here, I guess… * I'm missing something here, I guess...
*/ */
// DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */ // DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */
ret = CDDM_copy(dm); ret = CDDM_copy(dm);

10
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@ -28,7 +28,7 @@
/* /*
* XXX I'd like to make modified weights visible in WeightPaint mode, * XXX I'd like to make modified weights visible in WeightPaint mode,
* but couldn't figure a way to do this… * but couldn't figure a way to do this...
* Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)? * Maybe this will need changes in mesh_calc_modifiers (DerivedMesh.c)?
* Or the WeightPaint mode code itself? * Or the WeightPaint mode code itself?
*/ */
@ -385,13 +385,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
if (defgrp_idx < 0) if (defgrp_idx < 0)
return dm; return dm;
/* XXX All this to avoid copying dm when not needed… However, it nearly doubles compute /* XXX All this to avoid copying dm when not needed... However, it nearly doubles compute
* time! See scene 5 of the WeighVG test file… * time! See scene 5 of the WeighVG test file...
*/ */
#if 0 #if 0
/* Get actual dverts (ie vertex group data). */ /* Get actual dverts (ie vertex group data). */
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
/* If no dverts, return unmodified data… */ /* If no dverts, return unmodified data... */
if (dvert == NULL) if (dvert == NULL)
return dm; return dm;
@ -405,7 +405,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
/* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */ /* Create a copy of our dmesh, only if our affected cdata layer is the same as org mesh. */
if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) { if (dvert == CustomData_get_layer(&ob_m->vdata, CD_MDEFORMVERT)) {
/* XXX Seems to create problems with weightpaint mode??? /* XXX Seems to create problems with weightpaint mode???
* I'm missing something here, I guess… * I'm missing something here, I guess...
*/ */
// DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */ // DM_set_only_copy(dm, CD_MASK_MDEFORMVERT); /* Only copy defgroup layer. */
ret = CDDM_copy(dm); ret = CDDM_copy(dm);