RNA:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Nov 2011 16:26:53 +0000 (16:26 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Nov 2011 16:26:53 +0000 (16:26 +0000)
* Expose 3D view camera zoom and offset, needed if you want to precisely
  reconstruct camera parameters.
* Rename SpaceFileBrowser.operator to active_operator, to avoid conflict
  with c++ keyword.

release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/makesrna/intern/rna_space.c

index cf0d10c58448b39a0b1174e219b943307ec3fb2e..435b968f243833060db56bc2fe9da5abe6042cb7 100644 (file)
@@ -62,7 +62,7 @@ class FILEBROWSER_HT_header(Header):
             row.prop(params, "use_filter_folder", text="")
 
             if params.filter_glob:
-                #if st.operator and hasattr(st.operator, "filter_glob"):
+                #if st.active_operator and hasattr(st.active_operator, "filter_glob"):
                 #    row.prop(params, "filter_glob", text="")
                 row.label(params.filter_glob)
             else:
index 580f759c38f16a09297c546a2ed9d0a4328e5955..bb07fa86f3a184f40b7a68b90464ba2c7ec825fe 100644 (file)
@@ -1668,6 +1668,17 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        RNA_def_property_float_sdna(prop, NULL, "dist");
        RNA_def_property_ui_text(prop, "Distance", "Distance to the view location");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
+
+       prop= RNA_def_property(srna, "view_camera_zoom", PROP_INT, PROP_UNSIGNED);
+       RNA_def_property_int_sdna(prop, NULL, "camzoom");
+       RNA_def_property_ui_text(prop, "Camera Zoom", "Zoom factor in camera view");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
+
+       prop= RNA_def_property(srna, "view_camera_offset", PROP_FLOAT, PROP_NONE);
+       RNA_def_property_float_sdna(prop, NULL, "camdx");
+       RNA_def_property_array(prop, 2);
+       RNA_def_property_ui_text(prop, "Camera Offset", "View shift in camera view");
+       RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_space_buttons(BlenderRNA *brna)
@@ -2564,9 +2575,9 @@ static void rna_def_space_filebrowser(BlenderRNA *brna)
        RNA_def_property_pointer_sdna(prop, NULL, "params");
        RNA_def_property_ui_text(prop, "Filebrowser Parameter", "Parameters and Settings for the Filebrowser");
        
-       prop= RNA_def_property(srna, "operator", PROP_POINTER, PROP_NONE);
+       prop= RNA_def_property(srna, "active_operator", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "op");
-       RNA_def_property_ui_text(prop, "Operator", "");
+       RNA_def_property_ui_text(prop, "Active Operator", "");
 }
 
 static void rna_def_space_info(BlenderRNA *brna)