Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-11-25 04:00:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-25 04:00:55 +0400
commit9c262e5649303eff26e7645079185c250e4420ff (patch)
treea86bdedcd6b70cf020f7ecf254c7f3b53695b678 /source/blender/editors
parentd305df2226ccdf371d127d1c4f39690042f483bd (diff)
Code Cleanup: style comments
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_handlers.c3
-rw-r--r--source/blender/editors/space_image/image_ops.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index cdc692373c8..03dcf849b7e 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 58d835b0d2f..401c0a4b6a4 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));
}
}