[Bf-blender-cvs] [9c262e5] master: Code Cleanup: style comments
Campbell Barton
noreply at git.blender.org
Mon Nov 25 01:52:37 CET 2013
Commit: 9c262e5649303eff26e7645079185c250e4420ff
Author: Campbell Barton
Date: Mon Nov 25 11:00:55 2013 +1100
http://developer.blender.org/rB9c262e5649303eff26e7645079185c250e4420ff
Code Cleanup: style comments
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index cdc6923..03dcf84 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3534,7 +3534,8 @@ static int ui_do_but_LISTROW(bContext *C, uiBut *but, uiHandleButtonData *data,
/* hack to pass on ctrl+click and double click to overlapping text
* editing field for editing list item names */
if ((ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->val == KM_PRESS && event->ctrl) ||
- (event->type == LEFTMOUSE && event->val == KM_DBL_CLICK)) {
+ (event->type == LEFTMOUSE && event->val == KM_DBL_CLICK))
+ {
uiBut *labelbut = ui_but_find_mouse_over_ex(ar, event->x, event->y, true);
if (labelbut && labelbut->type == TEX) {
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 58d835b..401c0a4 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1793,8 +1793,8 @@ static int image_new_exec(bContext *C, wmOperator *op)
Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
if (tex && tex->type == TEX_IMAGE) {
if (tex->ima)
- tex->ima->id.us--; /* Decrease the previous image users count by 1 */
- tex->ima = ima; /* Assign the new image */
+ tex->ima->id.us--;
+ tex->ima = ima;
ED_area_tag_redraw(CTX_wm_area(C));
}
}
More information about the Bf-blender-cvs
mailing list