[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23066] branches/itasc/source/blender/ makesrna: Minor fix after merge

[Benoit Bolsee]

Revision: 23066
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23066
Author:   ben2610
Date:     2009-09-08 15:50:55 +0200 (Tue, 08 Sep 2009)

Log Message:
-----------
Minor fix after merge

Modified Paths:
--------------
    branches/itasc/source/blender/makesrna/SConscript
    branches/itasc/source/blender/makesrna/intern/rna_pose.c

Modified: branches/itasc/source/blender/makesrna/SConscript
===================================================================
--- branches/itasc/source/blender/makesrna/SConscript	2009-09-08 13:06:16 UTC (rev 23065)
+++ branches/itasc/source/blender/makesrna/SConscript	2009-09-08 13:50:55 UTC (rev 23066)
@@ -7,7 +7,7 @@
 objs += o
 
 incs = '#/intern/guardedalloc ../blenkernel ../blenlib ../makesdna intern .'
-incs += ' ../windowmanager ../editors/include ../imbuf'
+incs += ' ../windowmanager ../editors/include ../imbuf ../ikplugin'
 incs += ' ../render/extern/include'
 
 defs = []

Modified: branches/itasc/source/blender/makesrna/intern/rna_pose.c
===================================================================
--- branches/itasc/source/blender/makesrna/intern/rna_pose.c	2009-09-08 13:06:16 UTC (rev 23065)
+++ branches/itasc/source/blender/makesrna/intern/rna_pose.c	2009-09-08 13:50:55 UTC (rev 23066)
@@ -53,6 +53,8 @@
 #include "ED_object.h"
 #include "ED_armature.h"
 
+#include "MEM_guardedalloc.h"
+
 static void rna_Pose_update(bContext *C, PointerRNA *ptr)
 {
 	// XXX when to use this? ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);