[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41007] trunk/blender/source/blender: Fix for first part of #28911: driver not working properly since 2.594

[Sergey Sharybin]

Revision: 41007
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41007
Author:   nazgul
Date:     2011-10-14 11:24:20 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Fix for first part of #28911: driver not working properly since 2.594

Missed id type set for driver target when setting target id.

Patch by me and Campbell.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/ipo.c
    trunk/blender/source/blender/editors/interface/interface_anim.c

Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c        2011-10-14 
09:05:20 UTC (rev 41006)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c        2011-10-14 
11:24:20 UTC (rev 41007)
@@ -1034,12 +1034,14 @@
                                        /* first bone target */
                                dtar= &dvar->targets[0];
                                dtar->id= (ID *)idriver->ob;
+                               dtar->idtype= ID_OB;
                                if (idriver->name[0])
                                        BLI_strncpy(dtar->pchan_name, 
idriver->name, sizeof(dtar->pchan_name));
                                
                                        /* second bone target (name was stored 
in same var as the first one) */
                                dtar= &dvar->targets[1];
                                dtar->id= (ID *)idriver->ob;
+                               dtar->idtype= ID_OB;
                                if (idriver->name[0]) // xxx... for safety
                                        BLI_strncpy(dtar->pchan_name, 
idriver->name+DRIVER_NAME_OFFS, sizeof(dtar->pchan_name));
                        }
@@ -1051,6 +1053,7 @@
                                /* only requires a single target */
                                dtar= &dvar->targets[0];
                                dtar->id= (ID *)idriver->ob;
+                               dtar->idtype= ID_OB;
                                if (idriver->name[0])
                                        BLI_strncpy(dtar->pchan_name, 
idriver->name, sizeof(dtar->pchan_name));
                                dtar->transChan= 
adrcode_to_dtar_transchan(idriver->adrcode);
@@ -1065,6 +1068,7 @@
                                /* only requires single target */
                        dtar= &dvar->targets[0];
                        dtar->id= (ID *)idriver->ob;
+                       dtar->idtype= ID_OB;
                        dtar->transChan= 
adrcode_to_dtar_transchan(idriver->adrcode);
                }
        }

Modified: trunk/blender/source/blender/editors/interface/interface_anim.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_anim.c     
2011-10-14 09:05:20 UTC (rev 41006)
+++ trunk/blender/source/blender/editors/interface/interface_anim.c     
2011-10-14 11:24:20 UTC (rev 41007)
@@ -179,6 +179,7 @@
                                
                                dtar = &dvar->targets[0];
                                dtar->id = (ID *)CTX_data_scene(C); // XXX: 
should we check that C is valid first?
+                               dtar->idtype= ID_SCE;
                                dtar->rna_path = BLI_sprintfN("frame_current");
                        }
                        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs