griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

re-project paint failed on no-camera when a camera wasnt needed.

Browse Source 
(revision 27388 from render25 branch)
This commit is contained in:
Brecht Van Lommel
2010-03-11 17:16:03 +00:00
parent 8da10f59eb
commit bb3168afbe
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/sculpt_paint/paint_image.c
View File

@@ -5374,11 +5374,6 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
if(scene->camera==NULL) {
BKE_report(op->reports, RPT_ERROR, "No active camera set.");
return OPERATOR_CANCELLED;
}
if(image==NULL) {
BKE_report(op->reports, RPT_ERROR, "Image could not be found.");
return OPERATOR_CANCELLED;
@@ -5392,15 +5387,8 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
/* override */
ps.is_texbrush= 0;
ps.is_airbrush= 1;
orig_brush_size= ps.brush->size;
ps.brush->size= 32; /* cover the whole image */
ps.tool= PAINT_TOOL_DRAW; /* so pixels are initialized with minimal info */
idgroup= IDP_GetProperties(&image->id, 0);
if(idgroup) {
view_data= IDP_GetPropertyFromGroup(idgroup, PROJ_VIEW_DATA_ID);
@@ -5411,15 +5399,27 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
}
}
if(view_data) {
/* image has stored view projection info */
ps.source= PROJ_SRC_IMAGE_VIEW;
}
else {
ps.source= PROJ_SRC_IMAGE_CAM;
if(scene->camera==NULL) {
BKE_report(op->reports, RPT_ERROR, "No active camera set.");
return OPERATOR_CANCELLED;
}
}
/* override */
ps.is_texbrush= 0;
ps.is_airbrush= 1;
orig_brush_size= ps.brush->size;
ps.brush->size= 32; /* cover the whole image */
ps.tool= PAINT_TOOL_DRAW; /* so pixels are initialized with minimal info */
scene->toolsettings->imapaint.flag |= IMAGEPAINT_DRAWING;
undo_paint_push_begin(UNDO_PAINT_IMAGE, "Image Paint",