[Bf-blender-cvs] [df2537d] master: Revert "Hide the 3D cursor in a few cases where it is unneeded (active object is"
Antony Riakiotakis
noreply at git.blender.org
Sat Dec 14 16:24:51 CET 2013
Commit: df2537d09d88c9a4826a955209f67a4a37ead0b5
Author: Antony Riakiotakis
Date: Sat Dec 14 15:23:57 2013 +0200
http://developer.blender.org/rBdf2537d09d88c9a4826a955209f67a4a37ead0b5
Revert "Hide the 3D cursor in a few cases where it is unneeded (active object is"
This reverts commit 85eaa989807268dda60408f41475216ad45888d1.
Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index ea07873..9dd6ab8 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -33,7 +33,6 @@
#include <math.h>
#include "DNA_armature_types.h"
-#include "DNA_brush_types.h"
#include "DNA_camera_types.h"
#include "DNA_customdata_types.h"
#include "DNA_object_types.h"
@@ -51,7 +50,6 @@
#include "BLI_endian_switch.h"
#include "BKE_anim.h"
-#include "BKE_brush.h"
#include "BKE_camera.h"
#include "BKE_context.h"
#include "BKE_customdata.h"
@@ -3385,34 +3383,16 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha
}
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
- Object *ob = OBACT;
+ Object *ob;
- if (ob) {
- switch (ob->mode) {
- case OB_MODE_SCULPT:
- break;
-
- case OB_MODE_TEXTURE_PAINT:
- {
- Brush *br = BKE_paint_brush(&scene->toolsettings->imapaint.paint);
-
- if (br && (br->imagepaint_tool == PAINT_TOOL_CLONE))
- drawcursor(scene, ar, v3d);
-
- break;
- }
-
- default:
- drawcursor(scene, ar, v3d);
- break;
- }
- }
+ drawcursor(scene, ar, v3d);
if (U.uiflag & USER_SHOW_ROTVIEWICON)
draw_view_axis(rv3d, &rect);
else
draw_view_icon(rv3d, &rect);
+ ob = OBACT;
if (U.uiflag & USER_DRAWVIEWINFO)
draw_selected_name(scene, ob, &rect);
}
More information about the Bf-blender-cvs
mailing list