[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10978] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Bugfix #6864:

Joshua Leung aligorith at gmail.com
Wed Jun 20 07:23:32 CEST 2007


Revision: 10978
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10978
Author:   aligorith
Date:     2007-06-20 07:23:31 +0200 (Wed, 20 Jun 2007)

Log Message:
-----------
Bugfix #6864:

Copying Displace modifiers by themselves did not work correctly. The code was incorrectly just copying memory for source modifier to the new copy, causing problems due to the ModifierData struct at the start of the DisplaceModifierData struct (linked list pointers still referring to old stack).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2007-06-20 00:36:53 UTC (rev 10977)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2007-06-20 05:23:31 UTC (rev 10978)
@@ -2577,7 +2577,14 @@
 	DisplaceModifierData *dmd = (DisplaceModifierData*) md;
 	DisplaceModifierData *tdmd = (DisplaceModifierData*) target;
 
-	*tdmd = *dmd;
+	tdmd->texture = dmd->texture;
+	tdmd->strength = dmd->strength;
+	tdmd->direction = dmd->direction;
+	strncpy(tdmd->defgrp_name, dmd->defgrp_name, 32);
+	tdmd->midlevel = dmd->midlevel;
+	tdmd->texmapping = dmd->texmapping;
+	tdmd->map_object = dmd->map_object;
+	strncpy(tdmd->uvlayer_name, dmd->uvlayer_name, 32);
 }
 
 CustomDataMask displaceModifier_requiredDataMask(ModifierData *md)





More information about the Bf-blender-cvs mailing list