Revision: 42283
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42283
Author: nazgul
Date: 2011-11-30 05:34:32 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Rename Movie to Movie Clip source for background image
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/clip.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/clip.py 2011-11-30
05:03:59 UTC (rev 42282)
+++ trunk/blender/release/scripts/startup/bl_operators/clip.py 2011-11-30
05:34:32 UTC (rev 42283)
@@ -40,14 +40,14 @@
bgpic = None
for x in space_v3d.background_images:
- if x.source == 'MOVIE':
+ if x.source == 'MOVIE_CLIP':
bgpic = x
break
if not bgpic:
bgpic = space_v3d.background_images.new()
- bgpic.source = 'MOVIE'
+ bgpic.source = 'MOVIE_CLIP'
bgpic.clip = clip
bgpic.clip_user.proxy_render_size = user.proxy_render_size
bgpic.clip_user.use_render_undistorted = True
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-30
05:03:59 UTC (rev 42282)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-30
05:34:32 UTC (rev 42283)
@@ -2296,7 +2296,7 @@
row.prop(bg, "show_expanded", text="", emboss=False)
if bg.source == 'IMAGE' and bg.image:
row.prop(bg.image, "name", text="", emboss=False)
- elif bg.source == 'MOVIE' and bg.clip:
+ elif bg.source == 'MOVIE_CLIP' and bg.clip:
row.prop(bg.clip, "name", text="", emboss=False)
else:
row.label(text="Not Set")
@@ -2322,7 +2322,7 @@
box.template_image(bg, "image", bg.image_user,
compact=True)
has_bg = True
- elif bg.source == 'MOVIE':
+ elif bg.source == 'MOVIE_CLIP':
box.prop(bg, 'use_camera_clip')
column = box.column()
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-11-30
05:03:59 UTC (rev 42282)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-11-30
05:34:32 UTC (rev 42283)
@@ -1234,7 +1234,7 @@
static EnumPropertyItem bgpic_source_items[] = {
{V3D_BGPIC_IMAGE, "IMAGE", 0, "Image", ""},
- {V3D_BGPIC_MOVIE, "MOVIE", 0, "Movie", ""},
+ {V3D_BGPIC_MOVIE, "MOVIE_CLIP", 0, "Movie Clip", ""},
{0, NULL, 0, NULL, NULL}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
