[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35916] trunk/blender/source/blender/ makesrna/intern: fix for issue #2 in report: [#26695] Two fail cases with modifiers targeting linked assets
Campbell Barton
ideasman42 at gmail.com
Thu Mar 31 10:49:53 CEST 2011
Revision: 35916
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35916
Author: campbellbarton
Date: 2011-03-31 08:49:52 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
fix for issue #2 in report: [#26695] Two fail cases with modifiers targeting linked assets
also fix for scene.objects.link() not setting library data as being directly used.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-03-31 08:46:41 UTC (rev 35915)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-03-31 08:49:52 UTC (rev 35916)
@@ -437,9 +437,12 @@
{
Object *ob= value.data;
- if(!self || ob != self)
- if(!ob || type == OB_EMPTY || ob->type == type)
+ if(!self || ob != self) {
+ if(!ob || type == OB_EMPTY || ob->type == type) {
+ id_lib_extern((ID *)ob);
*ob_p= ob;
+ }
+ }
}
static void rna_LatticeModifier_object_set(PointerRNA *ptr, PointerRNA value)
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-03-31 08:46:41 UTC (rev 35915)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-03-31 08:49:52 UTC (rev 35916)
@@ -222,7 +222,7 @@
}
base= scene_add_base(scene, ob);
- ob->id.us++;
+ id_us_plus(&ob->id);
/* this is similar to what object_add_type and add_object do */
base->lay= scene->lay;
More information about the Bf-blender-cvs
mailing list