[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28482] trunk/blender: 3dview --> view3d, patch by Jonathan Smith with small corrections and changes.
Campbell Barton
ideasman42 at gmail.com
Wed Apr 28 09:25:39 CEST 2010
Revision: 28482
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28482
Author: campbellbarton
Date: 2010-04-28 09:25:39 +0200 (Wed, 28 Apr 2010)
Log Message:
-----------
3dview --> view3d, patch by Jonathan Smith with small corrections and changes.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/include/ED_gpencil.h
trunk/blender/source/blender/editors/include/ED_physics.h
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-04-28 07:25:39 UTC (rev 28482)
@@ -1832,7 +1832,7 @@
# ********** Panel **********
-class VIEW3D_PT_3dview_properties(bpy.types.Panel):
+class VIEW3D_PT_view3d_properties(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "View"
@@ -1867,7 +1867,7 @@
layout.column().prop(view, "cursor_location")
-class VIEW3D_PT_3dview_name(bpy.types.Panel):
+class VIEW3D_PT_view3d_name(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "Item"
@@ -1891,7 +1891,7 @@
row.prop(bone, "name", text="")
-class VIEW3D_PT_3dview_display(bpy.types.Panel):
+class VIEW3D_PT_view3d_display(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "Display"
@@ -1959,7 +1959,7 @@
row.prop(region, "box_clip")
-class VIEW3D_PT_3dview_meshdisplay(bpy.types.Panel):
+class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "Mesh Display"
@@ -1995,7 +1995,7 @@
col.prop(mesh, "draw_face_area")
-class VIEW3D_PT_3dview_curvedisplay(bpy.types.Panel):
+class VIEW3D_PT_view3d_curvedisplay(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
bl_label = "Curve Display"
@@ -2263,11 +2263,11 @@
VIEW3D_MT_armature_specials, # Only as a menu for keybindings
# Panels
- VIEW3D_PT_3dview_properties,
- VIEW3D_PT_3dview_display,
- VIEW3D_PT_3dview_name,
- VIEW3D_PT_3dview_meshdisplay,
- VIEW3D_PT_3dview_curvedisplay,
+ VIEW3D_PT_view3d_properties,
+ VIEW3D_PT_view3d_display,
+ VIEW3D_PT_view3d_name,
+ VIEW3D_PT_view3d_meshdisplay,
+ VIEW3D_PT_view3d_curvedisplay,
VIEW3D_PT_background_image,
VIEW3D_PT_transform_orientations,
VIEW3D_PT_etch_a_ton,
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -717,7 +717,7 @@
smd->domain->strength = 2.0;
smd->domain->noise = MOD_SMOKE_NOISEWAVE;
smd->domain->diss_speed = 5;
- // init 3dview buffer
+ // init view3d buffer
smd->domain->viewsettings = 0;
smd->domain->effector_weights = BKE_add_effector_weights(NULL);
}
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -2334,8 +2334,8 @@
case SPACE_VIEW3D:
{
/* this shouldn't cause any overflow... */
- //sprintf(name, "3DView:%s", view3d_get_name(sa->spacedata.first)); // XXX missing func..
- strcpy(name, "3dView");
+ //sprintf(name, "View3D:%s", view3d_get_name(sa->spacedata.first)); // XXX missing func..
+ strcpy(name, "View3D");
special= ICON_VIEW3D;
}
break;
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -709,7 +709,7 @@
/* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly
* Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes
*/
-void draw_gpencil_2dview (bContext *C, short onlyv2d)
+void draw_gpencil_view2d (bContext *C, short onlyv2d)
{
ScrArea *sa= CTX_wm_area(C);
ARegion *ar= CTX_wm_region(C);
@@ -735,7 +735,7 @@
/* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly
* Note: this gets called twice - first time with only3d=1 to draw 3d-strokes, second time with only3d=0 for screen-aligned strokes
*/
-void draw_gpencil_3dview_ext (Scene *scene, ARegion *ar, short only3d)
+void draw_gpencil_view3d_ext (Scene *scene, ARegion *ar, short only3d)
{
bGPdata *gpd;
int dflag = 0;
@@ -749,11 +749,11 @@
gp_draw_data(gpd, 0, 0, ar->winx, ar->winy, CFRA, dflag);
}
-void draw_gpencil_3dview (bContext *C, short only3d)
+void draw_gpencil_view3d (bContext *C, short only3d)
{
ARegion *ar= CTX_wm_region(C);
Scene *scene= CTX_data_scene(C);
- draw_gpencil_3dview_ext(scene, ar, only3d);
+ draw_gpencil_view3d_ext(scene, ar, only3d);
}
/* ************************************************** */
Modified: trunk/blender/source/blender/editors/include/ED_gpencil.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_gpencil.h 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/include/ED_gpencil.h 2010-04-28 07:25:39 UTC (rev 28482)
@@ -70,9 +70,9 @@
/* drawgpencil.c */
void draw_gpencil_2dimage(struct bContext *C, struct ImBuf *ibuf);
-void draw_gpencil_2dview(struct bContext *C, short onlyv2d);
-void draw_gpencil_3dview(struct bContext *C, short only3d);
-void draw_gpencil_3dview_ext(struct Scene *scene, struct ARegion *ar, short only3d);
+void draw_gpencil_view2d(struct bContext *C, short onlyv2d);
+void draw_gpencil_view3d(struct bContext *C, short only3d);
+void draw_gpencil_view3d_ext(struct Scene *scene, struct ARegion *ar, short only3d);
void gpencil_panel_standard(const struct bContext *C, struct Panel *pa);
Modified: trunk/blender/source/blender/editors/include/ED_physics.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_physics.h 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/include/ED_physics.h 2010-04-28 07:25:39 UTC (rev 28482)
@@ -35,7 +35,7 @@
/* particle_edit.c */
int PE_poll(struct bContext *C);
int PE_hair_poll(struct bContext *C);
-int PE_poll_3dview(struct bContext *C);
+int PE_poll_view3d(struct bContext *C);
/* operators */
void ED_operatortypes_physics(void);
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -124,7 +124,7 @@
return (edit && edit->psys);
}
-int PE_poll_3dview(bContext *C)
+int PE_poll_view3d(bContext *C)
{
return PE_poll(C) && CTX_wm_area(C)->spacetype == SPACE_VIEW3D &&
CTX_wm_region(C)->regiontype == RGN_TYPE_WINDOW;
@@ -1494,7 +1494,7 @@
/* api callbacks */
ot->exec= select_linked_exec;
ot->invoke= select_linked_invoke;
- ot->poll= PE_poll_3dview;
+ ot->poll= PE_poll_view3d;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2449,7 +2449,7 @@
pset->paintcursor = NULL;
}
else if(enable)
- pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll_3dview, brush_drawcursor, NULL);
+ pset->paintcursor= WM_paint_cursor_activate(CTX_wm_manager(C), PE_poll_view3d, brush_drawcursor, NULL);
}
/********************* radial control operator *********************/
@@ -3609,7 +3609,7 @@
ot->invoke= brush_edit_invoke;
ot->modal= brush_edit_modal;
ot->cancel= brush_edit_cancel;
- ot->poll= PE_poll_3dview;
+ ot->poll= PE_poll_view3d;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -496,7 +496,7 @@
/* draw grease-pencil ('screen' strokes) */
//if (sima->flag & SI_DISPGP)
- draw_gpencil_2dview(C, 0);
+ draw_gpencil_view2d(C, 0);
}
}
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -1130,14 +1130,14 @@
/* draw grease-pencil ('canvas' strokes) */
if (/*(snode->flag & SNODE_DISPGP) &&*/ (snode->nodetree))
- draw_gpencil_2dview((bContext*)C, 1);
+ draw_gpencil_view2d((bContext*)C, 1);
/* reset view matrix */
UI_view2d_view_restore(C);
/* draw grease-pencil (screen strokes, and also paintbuffer) */
if (/*(snode->flag & SNODE_DISPGP) && */(snode->nodetree))
- draw_gpencil_2dview((bContext*)C, 0);
+ draw_gpencil_view2d((bContext*)C, 0);
/* scrollers */
scrollers= UI_view2d_scrollers_calc(C, v2d, 10, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2010-04-28 06:46:44 UTC (rev 28481)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2010-04-28 07:25:39 UTC (rev 28482)
@@ -822,7 +822,7 @@
/* draw grease-pencil (screen aligned) */
// if (sseq->flag & SEQ_DRAW_GPENCIL)
-// XXX draw_gpencil_2dview(sa, 0);
+// XXX draw_gpencil_view2d(sa, 0);
/* ortho at pixel level */
UI_view2d_view_restore(C);
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c 2010-04-28 06:46:44 UTC (rev 28481)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list