3dview --> view3d, patch by Jonathan Smith with small corrections and changes.

11 files changed, 26 insertions, 25 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index abd88052b9c..43a0c8de955 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2334,8 +2334,8 @@ static void dummy_olddraw_gpencil ()
 				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;
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index fca525c0313..2b26f4a295d 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -709,7 +709,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
 /* 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 @@ void draw_gpencil_2dview (bContext *C, short onlyv2d)
 /* 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 @@ void draw_gpencil_3dview_ext (Scene *scene, ARegion *ar, short only3d)
 	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);
 }
 
 /* ************************************************** */
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 05534bd584c..0003cea8147 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -70,9 +70,9 @@ void ED_operatortypes_gpencil(void);
 /* 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);
 
diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h
index 606740d3c61..51906bf41c1 100644
--- a/source/blender/editors/include/ED_physics.h
+++ b/source/blender/editors/include/ED_physics.h
@@ -35,7 +35,7 @@ struct wmKeyConfig;
 /* 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);
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 0ee1ffc8337..c298ccc2f5c 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -124,7 +124,7 @@ int PE_hair_poll(bContext *C)
 	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 @@ void PARTICLE_OT_select_linked(wmOperatorType *ot)
 	/* 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 @@ static void toggle_particle_cursor(bContext *C, int enable)
 		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 @@ void PARTICLE_OT_brush_edit(wmOperatorType *ot)
 	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;
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index bcd37d97dcf..309c0061130 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -496,7 +496,7 @@ void draw_image_grease_pencil(bContext *C, short onlyv2d)
 		
 		/* draw grease-pencil ('screen' strokes) */
 		//if (sima->flag & SI_DISPGP)
-			draw_gpencil_2dview(C, 0);
+			draw_gpencil_view2d(C, 0);
 	}
 }
 
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 1acd42c036c..c74ab41b94a 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1130,14 +1130,14 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
 	
 	/* 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);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 0c0f44df170..2310b59b894 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -822,7 +822,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	
 	/* 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);
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 99b981408e5..401dc6b9974 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -212,7 +212,7 @@ void draw_volume(Scene *scene, ARegion *ar, View3D *v3d, Base *base, GPUTexture
 		{{-1.0f, 1.0f, -1.0f}, {2.0f, 0.0f, 0.0f}}
 	};
 
-	/* Fragment program to calculate the 3dview of smoke */
+	/* Fragment program to calculate the view3d of smoke */
 	/* using 2 textures, density and shadow */
 	const char *text = "!!ARBfp1.0\n"
 					"PARAM dx = program.local[0];\n"
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 47ff5c5d556..9f9733bc80c 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -77,6 +77,7 @@
 #include "ED_space_api.h"
 #include "ED_screen_types.h"
 #include "ED_transform.h"
+#include "ED_gpencil.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
@@ -1656,7 +1657,7 @@ void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d)
 	v3d->zbuf= TRUE;
 	glEnable(GL_DEPTH_TEST);
 
-	draw_gpencil_3dview_ext(scene, ar, 1);
+	draw_gpencil_view3d_ext(scene, ar, 1);
 	
 	v3d->zbuf= zbuf;
 
@@ -2022,12 +2023,12 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx,
 	}
 
 	/* draw grease-pencil stuff */
-	draw_gpencil_3dview_ext(scene, ar, 1);
+	draw_gpencil_view3d_ext(scene, ar, 1);
 
 	ED_region_pixelspace(ar);
 
 	/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-	draw_gpencil_3dview_ext(scene, ar, 0);
+	draw_gpencil_view3d_ext(scene, ar, 0);
 
 	GPU_free_images();
 
@@ -2343,7 +2344,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 		/* draw grease-pencil stuff (3d-space strokes) */
 		//if (v3d->flag2 & V3D_DISPGP)
-			draw_gpencil_3dview((bContext *)C, 1);
+			draw_gpencil_view3d((bContext *)C, 1);
 
 		BDR_drawSketch(C);
 	}
@@ -2362,7 +2363,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
 	//	if (v3d->flag2 & V3D_DISPGP)
-			draw_gpencil_3dview((bContext *)C, 0);
+			draw_gpencil_view3d((bContext *)C, 0);
 
 		drawcursor(scene, ar, v3d);
 	}
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index e781f45883f..489f00b105c 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -439,7 +439,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 	uiBlock *block;
 	uiLayout *row;
 	
-	RNA_pointer_create(&screen->id, &RNA_Space3DView, v3d, &v3dptr);	
+	RNA_pointer_create(&screen->id, &RNA_SpaceView3D, v3d, &v3dptr);	
 	RNA_pointer_create(&scene->id, &RNA_ToolSettings, ts, &toolsptr);
 	RNA_pointer_create(&scene->id, &RNA_Scene, scene, &sceneptr);