blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup in style from previous commit. 

Forgot that arc land also did the pus ot originh.
This commit is contained in:
Bastien Montagne 2020-09-22 10:33:22 +02:00
parent c5efd0939f
commit 129d9f79c9
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -5572,36 +5572,31 @@ static bool project_paint_op(void *state, const float lastpos[2], const float po
image_pool = BKE_image_pool_new();
if (!ELEM(ps->source, PROJ_SRC_VIEW, PROJ_SRC_VIEW_FILL)) {
/*This means we are reprojecting an image,
make sure the image has the needed data available.*/
/* This means we are reprojecting an image, make sure the image has the needed data available.
*/
bool float_dest = false;
bool uchar_dest = false;
/* check if the destination images are float or uchar */
/* Check if the destination images are float or uchar. */
for (i = 0; i < ps->image_tot; i++) {
if (ps->projImages[i].ibuf->rect != NULL) {
uchar_dest = true;
}
if (ps->projImages[i].ibuf->rect_float) {
if (ps->projImages[i].ibuf->rect_float != NULL) {
float_dest = true;
}
}
/* generate missing data if needed */
if (float_dest && ps->reproject_ibuf->rect_float == NULL)
{
/* Generate missing data if needed. */
if (float_dest && ps->reproject_ibuf->rect_float == NULL) {
IMB_float_from_rect(ps->reproject_ibuf);
ps->reproject_ibuf_free_float = true;
}
if (uchar_dest && ps->reproject_ibuf->rect == NULL)
{
if (uchar_dest && ps->reproject_ibuf->rect == NULL) {
IMB_rect_from_float(ps->reproject_ibuf);
ps->reproject_ibuf_free_uchar = true;
}
}
/* get the threads running */
for (a = 0; a < ps->thread_tot; a++) {