[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28284] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28280 :28283

[Brecht Van Lommel]

Revision: 28284
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28284
Author:   blendix
Date:     2010-04-19 15:30:13 +0200 (Mon, 19 Apr 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28280:28283

Modified Paths:
--------------
    branches/render25/release/scripts/io/engine_render_pov.py
    branches/render25/release/scripts/io/netrender/client.py
    branches/render25/release/scripts/ui/properties_data_camera.py
    branches/render25/source/blender/blenloader/intern/readfile.c

Modified: branches/render25/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/render25/release/scripts/io/engine_render_pov.py	2010-04-19 13:27:54 UTC (rev 28283)
+++ branches/render25/release/scripts/io/engine_render_pov.py	2010-04-19 13:30:13 UTC (rev 28284)
@@ -896,6 +896,14 @@
     except:
         pass
 del properties_texture
+import properties_data_camera
+for member in dir(properties_data_camera):
+    subclass = getattr(properties_data_camera, member)
+    try:
+        subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
+    except:
+        pass
+del properties_data_camera
 
 
 class RenderButtonsPanel(bpy.types.Panel):

Modified: branches/render25/release/scripts/io/netrender/client.py
===================================================================
--- branches/render25/release/scripts/io/netrender/client.py	2010-04-19 13:27:54 UTC (rev 28283)
+++ branches/render25/release/scripts/io/netrender/client.py	2010-04-19 13:30:13 UTC (rev 28284)
@@ -285,4 +285,5 @@
 compatible("properties_world")
 compatible("properties_material")
 compatible("properties_data_mesh")
+compatible("properties_data_camera")
 compatible("properties_texture")

Modified: branches/render25/release/scripts/ui/properties_data_camera.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_camera.py	2010-04-19 13:27:54 UTC (rev 28283)
+++ branches/render25/release/scripts/ui/properties_data_camera.py	2010-04-19 13:30:13 UTC (rev 28284)
@@ -29,12 +29,14 @@
     bl_context = "data"
 
     def poll(self, context):
-        return context.camera
+        engine = context.scene.render.engine
+        return context.camera and (engine in self.COMPAT_ENGINES)
 
 
 class DATA_PT_context_camera(DataButtonsPanel):
     bl_label = ""
     bl_show_header = False
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     def draw(self, context):
         layout = self.layout
@@ -61,10 +63,12 @@
 
 class DATA_PT_custom_props_camera(DataButtonsPanel, PropertyPanel):
     _context_path = "object.data"
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
 
 class DATA_PT_camera(DataButtonsPanel):
     bl_label = "Lens"
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     def draw(self, context):
         layout = self.layout
@@ -125,6 +129,7 @@
 
 class DATA_PT_camera_display(DataButtonsPanel):
     bl_label = "Display"
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 
     def draw(self, context):
         layout = self.layout

Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-19 13:27:54 UTC (rev 28283)
+++ branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-19 13:30:13 UTC (rev 28284)
@@ -4283,8 +4283,12 @@
 			seq->plugin= newdataadr(fd, seq->plugin);
 			seq->effectdata= newdataadr(fd, seq->effectdata);
 			
-			if (seq->type & SEQ_EFFECT) {
+			if(seq->type & SEQ_EFFECT)
 				seq->flag |= SEQ_EFFECT_NOT_LOADED;
+
+			if(seq->type == SEQ_SPEED) {
+				SpeedControlVars *s= seq->effectdata;
+				s->frameMap= NULL;
 			}
 
 			seq->strip= newdataadr(fd, seq->strip);