[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59429] branches/ soc-2013-meshdata_transfer/source/blender/editors: deactivating the tolerance bar according to the use_tolerance checkbox value

[Walid Shouman]

Revision: 59429
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59429
Author:   walid
Date:     2013-08-23 15:35:05 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
deactivating the tolerance bar according to the use_tolerance checkbox value

Modified Paths:
--------------
    branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/mesh_data.c
    branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_shapekey.c
    branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_vgroup.c

Modified: branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/mesh_data.c	2013-08-23 15:19:20 UTC (rev 59428)
+++ branches/soc-2013-meshdata_transfer/source/blender/editors/mesh/mesh_data.c	2013-08-23 15:35:05 UTC (rev 59429)
@@ -501,6 +501,7 @@
 	ReplaceGroupMode replace_mode = RNA_enum_get(op->ptr, "replace_mode");
 	bool use_tolerance = RNA_boolean_get(op->ptr, "use_tol");
 	float tolerance2 = RNA_float_get(op->ptr, "tol");
+	PropertyRNA *tolerance_prop = RNA_struct_find_property(op->ptr, "tol");
 
 	int num_src_lay, num_dst_lay;
 
@@ -517,6 +518,11 @@
 	invert_m4_m4(ob_src->imat, ob_src->obmat);
 	mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat);
 
+	if(use_tolerance == false)
+		RNA_def_property_flag(tolerance_prop, PROP_HIDDEN);
+	else
+		RNA_def_property_clear_flag(tolerance_prop, PROP_HIDDEN);
+
 	me_dst = ob_dst->data;
 	me_src = ob_src->data;
 
@@ -756,6 +762,7 @@
 	ReplaceGroupMode replace_mode = RNA_enum_get(op->ptr, "replace_mode");
 	bool use_tolerance = RNA_boolean_get(op->ptr, "use_tol");
 	float tolerance2 = RNA_float_get(op->ptr, "tol");
+	PropertyRNA *tolerance_prop = RNA_struct_find_property(op->ptr, "tol");
 
 	int num_src_lay, num_dst_lay;
 
@@ -772,6 +779,11 @@
 	invert_m4_m4(ob_src->imat, ob_src->obmat);
 	mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat);
 
+	if(use_tolerance == false)
+		RNA_def_property_flag(tolerance_prop, PROP_HIDDEN);
+	else
+		RNA_def_property_clear_flag(tolerance_prop, PROP_HIDDEN);
+
 	me_dst = ob_dst->data;
 	me_src = ob_src->data;
 

Modified: branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_shapekey.c
===================================================================
--- branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_shapekey.c	2013-08-23 15:19:20 UTC (rev 59428)
+++ branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_shapekey.c	2013-08-23 15:35:05 UTC (rev 59429)
@@ -322,6 +322,7 @@
 	ReplaceGroupMode replace_mode = RNA_enum_get(op->ptr, "replace_mode");
 	bool use_tolerance = RNA_boolean_get(op->ptr, "use_tol");
 	float tolerance2 = RNA_float_get(op->ptr, "tol");
+	PropertyRNA *tolerance_prop = RNA_struct_find_property(op->ptr, "tol");
 
 	struct ReplaceLayerInfo replace_info;
 
@@ -344,6 +345,11 @@
 	mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat);
 	//===== end of RC assignments
 
+	if(use_tolerance == false)
+		RNA_def_property_flag(tolerance_prop, PROP_HIDDEN);
+	else
+		RNA_def_property_clear_flag(tolerance_prop, PROP_HIDDEN);
+
 	me_dst = ob_dst->data;
 	me_src = ob_src->data;
 

Modified: branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_vgroup.c	2013-08-23 15:19:20 UTC (rev 59428)
+++ branches/soc-2013-meshdata_transfer/source/blender/editors/object/object_vgroup.c	2013-08-23 15:35:05 UTC (rev 59429)
@@ -236,6 +236,7 @@
 	float tolerance = RNA_float_get(op->ptr, "tol");
 	ReplaceGroupMode replace_mode = RNA_enum_get(op->ptr, "replace_mode");
 	bDeformGroup *dg_dst, *dg_src;
+	PropertyRNA *tolerance_prop = RNA_struct_find_property(op->ptr, "tol");
 
 	int num_src_lay, num_dst_lay;
 
@@ -251,6 +252,11 @@
 	invert_m4_m4(ob_src->imat, ob_src->obmat);
 	mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat);
 
+	if(use_tolerance == false)
+		RNA_def_property_flag(tolerance_prop, PROP_HIDDEN);
+	else
+		RNA_def_property_clear_flag(tolerance_prop, PROP_HIDDEN);
+
 	me_dst = ob_dst->data;
 	me_src = ob_src->data;