blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: warning, spaces

This commit is contained in:
Campbell Barton 2018-06-12 17:20:12 +02:00
parent 2af7c38682
commit e8dd4cd9ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface_templates.c
View File

@ -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;

2
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@ -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);
}

4
source/blender/makesrna/intern/rna_space.c
View File

@ -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;