Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-10-24 12:45:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-24 12:45:55 +0400
commit70bf00a74c1688e857e3ca1b143b4d7a57a30655 (patch)
tree8015eb2525a1aeca9c77fcbdf8fe222fff67948d /source/blender/editors/gpencil
parentdbe2fe5043b99f8a5717bbe5b6a9e36a6519f8c7 (diff)
parentf1cea89d99f0c80bdccd2ba1359142b5ff14cdb9 (diff)
svn merge ^/trunk/blender -r41200:41226 .
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/drawgpencil.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 8e83b01fc2f..07858f7182c 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -778,7 +778,7 @@ void draw_gpencil_view2d (bContext *C, short onlyv2d)
* 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_view3d_ext (Scene *scene, View3D *v3d, ARegion *ar, short only3d)
+void draw_gpencil_view3d (Scene *scene, View3D *v3d, ARegion *ar, short only3d)
{
bGPdata *gpd;
int dflag = 0;
@@ -809,12 +809,4 @@ void draw_gpencil_view3d_ext (Scene *scene, View3D *v3d, ARegion *ar, short only
gp_draw_data(gpd, rect.xmin, rect.ymin, rect.xmax, rect.ymax, CFRA, dflag);
}
-void draw_gpencil_view3d (bContext *C, short only3d)
-{
- ARegion *ar= CTX_wm_region(C);
- View3D *v3d= CTX_wm_view3d(C);
- Scene *scene= CTX_data_scene(C);
- draw_gpencil_view3d_ext(scene, v3d, ar, only3d);
-}
-
/* ************************************************** */