[Bf-blender-cvs] [083bc48816] blender2.8: Remove OBACT from rigidbody_constraint.c and remove uneeded sanity check

Dalai Felinto noreply at git.blender.org
Thu Mar 2 17:15:18 CET 2017


Commit: 083bc48816d0962d593c0a2d28b068dd24a706f8
Author: Dalai Felinto
Date:   Thu Mar 2 15:03:47 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB083bc48816d0962d593c0a2d28b068dd24a706f8

Remove OBACT from rigidbody_constraint.c and remove uneeded sanity check

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

M	source/blender/editors/physics/rigidbody_constraint.c

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

diff --git a/source/blender/editors/physics/rigidbody_constraint.c b/source/blender/editors/physics/rigidbody_constraint.c
index b7be31602d..fb75e27131 100644
--- a/source/blender/editors/physics/rigidbody_constraint.c
+++ b/source/blender/editors/physics/rigidbody_constraint.c
@@ -117,8 +117,9 @@ static int rigidbody_con_add_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	SceneLayer *sl = CTX_data_scene_layer(C);
 	RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene);
-	Object *ob = (scene) ? OBACT : NULL;
+	Object *ob = OBACT_NEW;
 	int type = RNA_enum_get(op->ptr, "type");
 	bool changed;
 
@@ -166,11 +167,8 @@ static int rigidbody_con_remove_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = (scene) ? OBACT : NULL;
-
-	/* sanity checks */
-	if (scene == NULL)
-		return OPERATOR_CANCELLED;
+	SceneLayer *sl = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW;
 
 	/* apply to active object */
 	if (ELEM(NULL, ob, ob->rigidbody_constraint)) {




More information about the Bf-blender-cvs mailing list