[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41250] branches/soc-2011-tomato: Camera tracking integration

[Sergey Sharybin]

Revision: 41250
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41250
Author:   nazgul
Date:     2011-10-24 15:25:02 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Fix compilation error when blenderplayer is enabled
- Fix for scene buttons error caused by property rename

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py	2011-10-24 15:24:53 UTC (rev 41249)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py	2011-10-24 15:25:02 UTC (rev 41250)
@@ -225,7 +225,7 @@
         layout = self.layout
         scene = context.scene
 
-        layout.prop(scene, "clip")
+        layout.prop(scene, "active_clip", text="Active Clip")
 
 
 class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):

Modified: branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-10-24 15:24:53 UTC (rev 41249)
+++ branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-10-24 15:25:02 UTC (rev 41250)
@@ -249,6 +249,7 @@
 int ED_view3d_scene_layer_set(int lay, const int *values){return 0;}
 void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){}
 void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist){}
+struct BGpic *ED_view3D_background_image_add(struct View3D *v3d){return (struct BGpic *) NULL;}
 void view3d_apply_mat4(float mat[][4], float *ofs, float *quat, float *dist){}
 int text_file_modified(struct Text *text){return 0;}
 void ED_node_shader_default(struct Material *ma){}