[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37213] branches/soc-2011-salad/source/ blender/makesrna/intern/rna_fcurve.c: Salad Branch: fix compile error, looks like mistake in merge confict resolution.

[Brecht Van Lommel]

Revision: 37213
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37213
Author:   blendix
Date:     2011-06-05 15:25:43 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Salad Branch: fix compile error, looks like mistake in merge confict resolution.

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c

Modified: branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c 
2011-06-05 14:49:11 UTC (rev 37212)
+++ branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c 
2011-06-05 15:25:43 UTC (rev 37213)
@@ -454,7 +454,7 @@
        fm->flag |= FMODIFIER_FLAG_ACTIVE;
 }
 
-static void rna_FModifier_active_update(Main *UNUSED(bmain), Scene 
*UNUSED(scene), PointerRNA *ptr)
+static void rna_FModifier_start_frame_range(PointerRNA *ptr, float *min, float 
*max)
 {
        FModifier *fcm= (FModifier*)ptr->data;
        

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