[Bf-blender-cvs] [1fd11dd3ba8] blender2.8: Cleanup: comments, use negate_mat3_m4

Campbell Barton noreply at git.blender.org
Fri May 18 20:23:58 CEST 2018


Commit: 1fd11dd3ba83663939aefc96a435cc0e5b5b68e3
Author: Campbell Barton
Date:   Fri May 18 19:55:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1fd11dd3ba83663939aefc96a435cc0e5b5b68e3

Cleanup: comments, use negate_mat3_m4

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

M	source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
M	source/blender/editors/mesh/editmesh_add_manipulator.c
M	source/blender/makesrna/intern/rna_wm_api.c

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

diff --git a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
index 770e7716dd2..86c3b4a09de 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
@@ -306,7 +306,7 @@ static void MANIPULATOR_WT_button_2d(wmManipulatorType *wt)
 	prop = RNA_def_property(wt->srna, "icon", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, rna_enum_icon_items);
 
-	/* Passed to 'GPU_batch_from_poly_2d_encoded' */
+	/* Passed to 'GPU_batch_tris_from_poly_2d_encoded' */
 	RNA_def_property(wt->srna, "shape", PROP_STRING, PROP_BYTESTRING);
 
 	/* Currently only used for cursor display. */
diff --git a/source/blender/editors/mesh/editmesh_add_manipulator.c b/source/blender/editors/mesh/editmesh_add_manipulator.c
index cb531151b84..65e12e673af 100644
--- a/source/blender/editors/mesh/editmesh_add_manipulator.c
+++ b/source/blender/editors/mesh/editmesh_add_manipulator.c
@@ -189,9 +189,7 @@ static void manipulator_placement_prop_matrix_set(
 	mul_m4_m4m4(mat, man->cage->matrix_basis, value);
 
 	if (is_negative_m4(mat)) {
-		negate_v3(mat[0]);
-		negate_v3(mat[1]);
-		negate_v3(mat[2]);
+		negate_mat3_m4(mat);
 	}
 
 	RNA_property_float_set_array(op->ptr, man->data.prop_matrix, &mat[0][0]);
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index ba955d65ac5..a08a1846c5b 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -572,7 +572,7 @@ void RNA_api_wm(StructRNA *srna)
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
 
 
-	/* wrap UI_popover_panel_begin */
+	/* wrap UI_popover_begin */
 	func = RNA_def_function(srna, "popover_begin__internal", "rna_PopoverBegin");
 	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
 	/* return */
@@ -580,7 +580,7 @@ void RNA_api_wm(StructRNA *srna)
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
 	RNA_def_function_return(func, parm);
 
-	/* wrap UI_popover_panel_end */
+	/* wrap UI_popover_end */
 	func = RNA_def_function(srna, "popover_end__internal", "rna_PopoverEnd");
 	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
 	parm = RNA_def_pointer(func, "menu", "UIPopover", "", "");



More information about the Bf-blender-cvs mailing list