[Bf-blender-cvs] [be2e549111b] master: Use scene active object for sculptmode enter/exit calls

Campbell Barton noreply at git.blender.org
Mon Dec 3 08:00:43 CET 2018


Commit: be2e549111b8dd47a9e468fe34dd1396f99b1cb1
Author: Campbell Barton
Date:   Mon Dec 3 18:00:20 2018 +1100
Branches: master
https://developer.blender.org/rBbe2e549111b8dd47a9e468fe34dd1396f99b1cb1

Use scene active object for sculptmode enter/exit calls

Match logic in previous commit.

===================================================================

M	source/blender/editors/sculpt_paint/sculpt.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 309a7aa2102..afee44c3dcc 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5728,7 +5728,7 @@ void ED_object_sculptmode_enter(struct bContext *C, ReportList *reports)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_active_object(C);
+	Object *ob = OBACT;
 	ED_object_sculptmode_enter_ex(bmain, scene, ob, reports);
 }
 
@@ -5781,7 +5781,7 @@ void ED_object_sculptmode_exit_ex(
 void ED_object_sculptmode_exit(bContext *C)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_active_object(C);
+	Object *ob = OBACT;
 	ED_object_sculptmode_exit_ex(scene, ob);
 }



More information about the Bf-blender-cvs mailing list