[Bf-blender-cvs] [e8dd4cd9cab] blender2.8: Cleanup: warning, spaces

Campbell Barton noreply at git.blender.org
Tue Jun 12 17:36:16 CEST 2018


Commit: e8dd4cd9cabb76f00838a975627c571a4fccdb18
Author: Campbell Barton
Date:   Tue Jun 12 17:20:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe8dd4cd9cabb76f00838a975627c571a4fccdb18

Cleanup: warning, spaces

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

M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/sculpt_paint/paint_stroke.c
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 45069ada92f..70b591d3a69 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2266,7 +2266,7 @@ void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname,
 	value = RNA_property_enum_get(ptr, prop);
 	RNA_enum_icon_from_value(items, value, &icon);
 
-	
+
 	if (RNA_property_editable(ptr, prop)) {
 		cb_args = MEM_callocN(sizeof(IconViewMenuArgs), __func__);
 		cb_args->ptr = *ptr;
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 2e16ddb628f..a7aa19807dd 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -409,7 +409,7 @@ static bool paint_brush_update(bContext *C,
 	if ((do_random || do_random_mask) && stroke->rng == NULL) {
 		/* Lazy initialization. */
 		uint rng_seed = (uint)(PIL_check_seconds_timer_i() & UINT_MAX);
-		rng_seed ^= (uint)(brush);
+		rng_seed ^= (uint)GET_INT_FROM_POINTER(brush);
 		stroke->rng = BLI_rng_new(rng_seed);
 	}
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 8de651f822d..ab1409192c2 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -720,7 +720,7 @@ static int rna_View3DShading_studio_light_get(PointerRNA *ptr)
 {
 	View3D *v3d = (View3D *)ptr->data;
 	char* dna_storage = v3d->shading.studio_light;
-	
+
 	int flag = STUDIOLIGHT_ORIENTATIONS_SOLID;
 	if (v3d->drawtype == OB_SOLID && v3d->shading.light == V3D_LIGHTING_MATCAP) {
 		flag = STUDIOLIGHT_ORIENTATION_VIEWNORMAL;
@@ -738,7 +738,7 @@ static void rna_View3DShading_studio_light_set(PointerRNA *ptr, int value)
 {
 	View3D *v3d = (View3D *)ptr->data;
 	char* dna_storage = v3d->shading.studio_light;
-	
+
 	int flag = STUDIOLIGHT_ORIENTATIONS_SOLID;
 	if (v3d->drawtype == OB_SOLID && v3d->shading.light == V3D_LIGHTING_MATCAP) {
 		flag = STUDIOLIGHT_ORIENTATION_VIEWNORMAL;



More information about the Bf-blender-cvs mailing list