Follow up to r57354: WeightVG and Wave modifiers too need to handle tex id refcount ;)
This commit is contained in:
parent
5183ba74a8
commit
67a5d1b660
@ -43,9 +43,10 @@
|
|||||||
#include "BLI_string.h"
|
#include "BLI_string.h"
|
||||||
|
|
||||||
|
|
||||||
#include "BKE_DerivedMesh.h"
|
|
||||||
#include "BKE_object.h"
|
|
||||||
#include "BKE_deform.h"
|
#include "BKE_deform.h"
|
||||||
|
#include "BKE_DerivedMesh.h"
|
||||||
|
#include "BKE_library.h"
|
||||||
|
#include "BKE_object.h"
|
||||||
#include "BKE_scene.h"
|
#include "BKE_scene.h"
|
||||||
|
|
||||||
#include "depsgraph_private.h"
|
#include "depsgraph_private.h"
|
||||||
@ -77,6 +78,14 @@ static void initData(ModifierData *md)
|
|||||||
wmd->defgrp_name[0] = 0;
|
wmd->defgrp_name[0] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void freeData(ModifierData *md)
|
||||||
|
{
|
||||||
|
WaveModifierData *wmd = (WaveModifierData *) md;
|
||||||
|
if (wmd->texture) {
|
||||||
|
id_us_min(&wmd->texture->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void copyData(ModifierData *md, ModifierData *target)
|
static void copyData(ModifierData *md, ModifierData *target)
|
||||||
{
|
{
|
||||||
WaveModifierData *wmd = (WaveModifierData *) md;
|
WaveModifierData *wmd = (WaveModifierData *) md;
|
||||||
@ -98,6 +107,10 @@ static void copyData(ModifierData *md, ModifierData *target)
|
|||||||
twmd->map_object = wmd->map_object;
|
twmd->map_object = wmd->map_object;
|
||||||
twmd->texmapping = wmd->texmapping;
|
twmd->texmapping = wmd->texmapping;
|
||||||
BLI_strncpy(twmd->defgrp_name, wmd->defgrp_name, sizeof(twmd->defgrp_name));
|
BLI_strncpy(twmd->defgrp_name, wmd->defgrp_name, sizeof(twmd->defgrp_name));
|
||||||
|
|
||||||
|
if (twmd->texture) {
|
||||||
|
id_us_plus(&twmd->texture->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool dependsOnTime(ModifierData *UNUSED(md))
|
static bool dependsOnTime(ModifierData *UNUSED(md))
|
||||||
@ -378,7 +391,7 @@ ModifierTypeInfo modifierType_Wave = {
|
|||||||
/* applyModifierEM */ NULL,
|
/* applyModifierEM */ NULL,
|
||||||
/* initData */ initData,
|
/* initData */ initData,
|
||||||
/* requiredDataMask */ requiredDataMask,
|
/* requiredDataMask */ requiredDataMask,
|
||||||
/* freeData */ NULL,
|
/* freeData */ freeData,
|
||||||
/* isDisabled */ NULL,
|
/* isDisabled */ NULL,
|
||||||
/* updateDepgraph */ updateDepgraph,
|
/* updateDepgraph */ updateDepgraph,
|
||||||
/* dependsOnTime */ dependsOnTime,
|
/* dependsOnTime */ dependsOnTime,
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include "BKE_cdderivedmesh.h"
|
#include "BKE_cdderivedmesh.h"
|
||||||
#include "BKE_colortools.h" /* CurveMapping. */
|
#include "BKE_colortools.h" /* CurveMapping. */
|
||||||
#include "BKE_deform.h"
|
#include "BKE_deform.h"
|
||||||
|
#include "BKE_library.h"
|
||||||
#include "BKE_mesh.h"
|
#include "BKE_mesh.h"
|
||||||
#include "BKE_modifier.h"
|
#include "BKE_modifier.h"
|
||||||
#include "BKE_texture.h" /* Texture masking. */
|
#include "BKE_texture.h" /* Texture masking. */
|
||||||
@ -77,6 +78,10 @@ static void freeData(ModifierData *md)
|
|||||||
{
|
{
|
||||||
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
|
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
|
||||||
curvemapping_free(wmd->cmap_curve);
|
curvemapping_free(wmd->cmap_curve);
|
||||||
|
|
||||||
|
if (wmd->mask_texture) {
|
||||||
|
id_us_min(&wmd->mask_texture->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void copyData(ModifierData *md, ModifierData *target)
|
static void copyData(ModifierData *md, ModifierData *target)
|
||||||
@ -102,6 +107,10 @@ static void copyData(ModifierData *md, ModifierData *target)
|
|||||||
twmd->mask_tex_mapping = wmd->mask_tex_mapping;
|
twmd->mask_tex_mapping = wmd->mask_tex_mapping;
|
||||||
twmd->mask_tex_map_obj = wmd->mask_tex_map_obj;
|
twmd->mask_tex_map_obj = wmd->mask_tex_map_obj;
|
||||||
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
||||||
|
|
||||||
|
if (twmd->mask_texture) {
|
||||||
|
id_us_plus(&twmd->mask_texture->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
#include "BKE_cdderivedmesh.h"
|
#include "BKE_cdderivedmesh.h"
|
||||||
#include "BKE_deform.h"
|
#include "BKE_deform.h"
|
||||||
|
#include "BKE_library.h"
|
||||||
#include "BKE_mesh.h"
|
#include "BKE_mesh.h"
|
||||||
#include "BKE_modifier.h"
|
#include "BKE_modifier.h"
|
||||||
#include "BKE_texture.h" /* Texture masking. */
|
#include "BKE_texture.h" /* Texture masking. */
|
||||||
@ -123,6 +124,14 @@ static void initData(ModifierData *md)
|
|||||||
wmd->mask_tex_mapping = MOD_DISP_MAP_LOCAL;
|
wmd->mask_tex_mapping = MOD_DISP_MAP_LOCAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void freeData(ModifierData *md)
|
||||||
|
{
|
||||||
|
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
|
||||||
|
if (wmd->mask_texture) {
|
||||||
|
id_us_min(&wmd->mask_texture->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void copyData(ModifierData *md, ModifierData *target)
|
static void copyData(ModifierData *md, ModifierData *target)
|
||||||
{
|
{
|
||||||
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
|
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
|
||||||
@ -142,6 +151,10 @@ static void copyData(ModifierData *md, ModifierData *target)
|
|||||||
twmd->mask_tex_mapping = wmd->mask_tex_mapping;
|
twmd->mask_tex_mapping = wmd->mask_tex_mapping;
|
||||||
twmd->mask_tex_map_obj = wmd->mask_tex_map_obj;
|
twmd->mask_tex_map_obj = wmd->mask_tex_map_obj;
|
||||||
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
||||||
|
|
||||||
|
if (twmd->mask_texture) {
|
||||||
|
id_us_plus(&twmd->mask_texture->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
||||||
@ -418,7 +431,7 @@ ModifierTypeInfo modifierType_WeightVGMix = {
|
|||||||
/* applyModifierEM */ NULL,
|
/* applyModifierEM */ NULL,
|
||||||
/* initData */ initData,
|
/* initData */ initData,
|
||||||
/* requiredDataMask */ requiredDataMask,
|
/* requiredDataMask */ requiredDataMask,
|
||||||
/* freeData */ NULL,
|
/* freeData */ freeData,
|
||||||
/* isDisabled */ isDisabled,
|
/* isDisabled */ isDisabled,
|
||||||
/* updateDepgraph */ updateDepgraph,
|
/* updateDepgraph */ updateDepgraph,
|
||||||
/* dependsOnTime */ dependsOnTime,
|
/* dependsOnTime */ dependsOnTime,
|
||||||
|
@ -47,6 +47,7 @@
|
|||||||
|
|
||||||
#include "BKE_cdderivedmesh.h"
|
#include "BKE_cdderivedmesh.h"
|
||||||
#include "BKE_deform.h"
|
#include "BKE_deform.h"
|
||||||
|
#include "BKE_library.h"
|
||||||
#include "BKE_mesh.h"
|
#include "BKE_mesh.h"
|
||||||
#include "BKE_modifier.h"
|
#include "BKE_modifier.h"
|
||||||
#include "BKE_shrinkwrap.h" /* For SpaceTransform stuff. */
|
#include "BKE_shrinkwrap.h" /* For SpaceTransform stuff. */
|
||||||
@ -242,6 +243,14 @@ static void initData(ModifierData *md)
|
|||||||
wmd->max_dist = 1.0f; /* vert arbitrary distance, but don't use 0 */
|
wmd->max_dist = 1.0f; /* vert arbitrary distance, but don't use 0 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void freeData(ModifierData *md)
|
||||||
|
{
|
||||||
|
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
|
||||||
|
if (wmd->mask_texture) {
|
||||||
|
id_us_min(&wmd->mask_texture->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void copyData(ModifierData *md, ModifierData *target)
|
static void copyData(ModifierData *md, ModifierData *target)
|
||||||
{
|
{
|
||||||
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
|
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
|
||||||
@ -263,6 +272,10 @@ static void copyData(ModifierData *md, ModifierData *target)
|
|||||||
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
BLI_strncpy(twmd->mask_tex_uvlayer_name, wmd->mask_tex_uvlayer_name, sizeof(twmd->mask_tex_uvlayer_name));
|
||||||
twmd->min_dist = wmd->min_dist;
|
twmd->min_dist = wmd->min_dist;
|
||||||
twmd->max_dist = wmd->max_dist;
|
twmd->max_dist = wmd->max_dist;
|
||||||
|
|
||||||
|
if (twmd->mask_texture) {
|
||||||
|
id_us_plus(&twmd->mask_texture->id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
|
||||||
@ -563,7 +576,7 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
|
|||||||
/* applyModifierEM */ NULL,
|
/* applyModifierEM */ NULL,
|
||||||
/* initData */ initData,
|
/* initData */ initData,
|
||||||
/* requiredDataMask */ requiredDataMask,
|
/* requiredDataMask */ requiredDataMask,
|
||||||
/* freeData */ NULL,
|
/* freeData */ freeData,
|
||||||
/* isDisabled */ isDisabled,
|
/* isDisabled */ isDisabled,
|
||||||
/* updateDepgraph */ updateDepgraph,
|
/* updateDepgraph */ updateDepgraph,
|
||||||
/* dependsOnTime */ dependsOnTime,
|
/* dependsOnTime */ dependsOnTime,
|
||||||
|
Loading…
Reference in New Issue
Block a user