Revision: 21905
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21905
Author: blendix
Date: 2009-07-26 00:22:47 +0200 (Sun, 26 Jul 2009)
Log Message:
-----------
2.5: fix for use background image toggle in 3d view, it didn't
allocate the right data.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_view3d.py
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py 2009-07-25
22:20:26 UTC (rev 21904)
+++ branches/blender2.5/blender/release/ui/space_view3d.py 2009-07-25
22:22:47 UTC (rev 21905)
@@ -182,19 +182,21 @@
layout = self.layout
view = context.space_data
- bg = context.space_data.background_image
-
- layout.active = view.display_background_image
- split = layout.split()
- col = split.column()
- col.itemR(bg, "image")
-# col.itemR(bg, "image_user")
- col.itemR(bg, "size")
- col.itemR(bg, "transparency", slider=True)
- col.itemL(text="Offset:")
- col.itemR(bg, "x_offset", text="X")
- col.itemR(bg, "y_offset", text="Y")
+ bg = view.background_image
+ if bg:
+ layout.active = view.display_background_image
+
+ split = layout.split()
+ col = split.column()
+ col.itemR(bg, "image", text="")
+ #col.itemR(bg, "image_user")
+ col.itemR(bg, "size")
+ col.itemR(bg, "transparency", slider=True)
+ col.itemL(text="Offset:")
+ col.itemR(bg, "x_offset", text="X")
+ col.itemR(bg, "y_offset", text="Y")
+
bpy.types.register(VIEW3D_MT_view_navigation)
bpy.types.register(VIEW3D_MT_view)
bpy.types.register(VIEW3D_HT_header)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-07-25 22:20:26 UTC (rev 21904)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
2009-07-25 22:22:47 UTC (rev 21905)
@@ -287,6 +287,22 @@
*max= ci->len;
}
+static void rna_View3D_display_background_image_set(PointerRNA *ptr, int value)
+{
+ View3D *vd= (View3D*)ptr->data;
+
+ if(value) vd->flag |= V3D_DISPBGPIC;
+ else vd->flag &= ~V3D_DISPBGPIC;
+
+ if((vd->flag & V3D_DISPBGPIC) && vd->bgpic == NULL) {
+ vd->bgpic= MEM_callocN(sizeof(BGpic), "bgpic");
+ vd->bgpic->size= 5.0;
+ vd->bgpic->blend= 0.5;
+ vd->bgpic->iuser.fie_ima= 2;
+ vd->bgpic->iuser.ok= 1;
+ }
+}
+
#else
static void rna_def_space(BlenderRNA *brna)
@@ -454,6 +470,7 @@
prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "ima");
RNA_def_property_ui_text(prop, "Image", "Image displayed and edited in
this space.");
+ RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, NULL);
prop= RNA_def_property(srna, "image_user", PROP_POINTER,
PROP_NEVER_NULL);
@@ -612,6 +629,7 @@
RNA_def_property_update(prop, NC_WINDOW, NULL);
prop= RNA_def_property(srna, "display_background_image", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_funcs(prop, NULL,
"rna_View3D_display_background_image_set");
RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DISPBGPIC);
RNA_def_property_ui_text(prop, "Display Background Image", "Display a
reference image behind objects in the 3D View");
RNA_def_property_update(prop, NC_WINDOW, NULL);
@@ -701,6 +719,11 @@
RNA_def_property_ui_text(prop, "Align", "Arrangement of the panels.");
RNA_def_property_update(prop, NC_WINDOW, NULL);
+ prop= RNA_def_property(srna, "brush_texture", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", SB_BRUSH_TEX);
+ RNA_def_property_ui_text(prop, "Brush Texture", "Show brush textures.");
+ RNA_def_property_update(prop, NC_WINDOW, NULL);
+
/* pinned data */
prop= RNA_def_property(srna, "pin_id", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "pinid");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
