[Bf-blender-cvs] [a84eaef] temp_widgets_c++_experiment: Merge branch 'wiggly-widgets' into temp_widgets_c++_experiment

Julian Eisel noreply at git.blender.org
Mon Dec 21 20:56:47 CET 2015


Commit: a84eaeff1a379a0b5e83652f9e526f92fb1b9457
Author: Julian Eisel
Date:   Mon Dec 21 20:46:32 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rBa84eaeff1a379a0b5e83652f9e526f92fb1b9457

Merge branch 'wiggly-widgets' into temp_widgets_c++_experiment

Conflicts:
	source/blender/editors/object/object_edit.c

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index 0f62269,179d844..c27287b
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -1202,12 -1236,16 +1236,18 @@@ void WIDGETGROUP_object_manipulator_cre
  	WIDGETGROUP_manipulator_create(C, wgroup);
  }
  
- int WIDGETGROUP_manipulator_poll(const struct bContext *C, struct wmWidgetGroupType *UNUSED(wgrouptype))
 -
+ int WIDGETGROUP_object_manipulator_poll(const struct bContext *C, struct wmWidgetGroupType *wgrouptype)
  {
- 	/* it's a given we only use this in 3D view */
- 	const ScrArea *sa = CTX_wm_area(C);
- 	const View3D *v3d = sa->spacedata.first;
+ 	Object *ob = ED_object_active_context((bContext *)C);
  
- 	return ((v3d->twflag & V3D_USE_MANIPULATOR) != 0);
+ 	if (ED_operator_object_active((bContext *)C)) {
 -		if (STREQ(wgrouptype->idname, ob->id.name)) {
++		char idname[MAX_NAME];
++
++		WM_widgetgrouptype_idname_get(wgrouptype, idname);
++		if (STREQ(idname, ob->id.name)) {
+ 			return true;
+ 		}
+ 	}
+ 	return false;
  }




More information about the Bf-blender-cvs mailing list