[Bf-blender-cvs] [a4ce6ed948a] temp-trimesh-sculpt: attempt to reverse old cycles patch in joeedh-trimesh-sculpt branch
Joseph Eagar
noreply at git.blender.org
Wed Oct 14 04:05:48 CEST 2020
Commit: a4ce6ed948a4e141d3d2c5bcfff8e5d2fcf99ef4
Author: Joseph Eagar
Date: Tue Oct 6 10:13:43 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rBa4ce6ed948a4e141d3d2c5bcfff8e5d2fcf99ef4
attempt to reverse old cycles patch in joeedh-trimesh-sculpt branch
===================================================================
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
D intern/cycles/kernel/kernel_bluenoise_mask.h
M intern/cycles/render/integrator.cpp
D intern/cycles/util/util_bluenoise_mask.cpp
===================================================================
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index f93602e673e..0a2bb56e9ce 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -313,11 +313,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
min=0, max=(1 << 24),
default=32,
)
- preview_pause: BoolProperty(
- name="Pause Preview",
- description="Pause all viewport preview renders",
- default=False,
- )
aa_samples: IntProperty(
name="AA Samples",
description="Number of antialiasing samples to render for each pixel",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 4acfd15b286..1ccd4851d9c 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -174,9 +174,10 @@ class CYCLES_RENDER_PT_sampling(CyclesButtonsPanel, Panel):
layout.use_property_split = True
layout.use_property_decorate = False
- layout.prop(cscene, "progressive")
-
- if cscene.progressive == 'PATH' or use_branched_path(context) is False:
+ if not use_optix(context):
+ layout.prop(cscene, "progressive")
+
+ if not use_branched_path(context):
col = layout.column(align=True)
col.prop(cscene, "samples", text="Render")
col.prop(cscene, "preview_samples", text="Viewport")
@@ -296,7 +297,7 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
scene = context.scene
cscene = scene.cycles
-
+
row = layout.row(align=True)
row.prop(cscene, "seed")
row.prop(cscene, "use_animated_seed", text="", icon='TIME')
diff --git a/intern/cycles/kernel/kernel_bluenoise_mask.h b/intern/cycles/kernel/kernel_bluenoise_mask.h
deleted file mode 100755
index b3c6a04b6a8..00000000000
--- a/intern/cycles/kernel/kernel_bluenoise_mask.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-CCL_NAMESPACE_BEGIN
-
-#define BLUE_MASK_DIMEN 128
-#define BLUE_MASK_BYTES_PER_PIXEL 2
-#define BLUE_MASK_MASK 127
-
-extern unsigned short bluenoise_mask[16384];
-
-CCL_NAMESPACE_END
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 6bea1d14b5f..d6ee57bafdf 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -199,7 +199,6 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
kintegrator->sampling_pattern = sampling_pattern;
kintegrator->aa_samples = aa_samples;
-
if (aa_samples > 0 && adaptive_min_samples == 0) {
kintegrator->adaptive_min_samples = max(4, (int)sqrtf(aa_samples));
VLOG(1) << "Cycles adaptive sampling: automatic min samples = "
diff --git a/intern/cycles/util/util_bluenoise_mask.cpp b/intern/cycles/util/util_bluenoise_mask.cpp
deleted file mode 100755
index 2a82681db7d..00000000000
--- a/intern/cycles/util/util_bluenoise_mask.cpp
+++ /dev/null
@@ -1,1470 +0,0 @@
-//see kernel/kernel_bluenoise_mask.h
-
-CCL_NAMESPACE_BEGIN
-
-unsigned short bluenoise_mask[16384] = {
-0xa44d,0x4afd,0xf046,0x77d6,0xbbde,0xf832,0x1202,0xb83f,0x6957,0x92ad,0xc9ef,
-0x24ba,0xe5b9,0x2bba,0xd8bc,0x9d3,0x44dc,0xbc39,0x28fe,0x9818,0xd7b,0xa3f3,0xc2d7,
-0xf012,0x5f84,0xc657,0xf2f9,0xa658,0x6040,0xfc04,0x8793,0x2875,0xe0b4,0x418b,
-0x7d74,0x280e,0xe80f,0x7a3b,0xc2d3,0x41ab,0x9d41,0xfa3d,0xbab8,0x1383,0xb25d,
-0x3065,0xebb2,0xbd30,0x2ce1,0x905b,0xf968,0x689b,0x1315,0x4b20,0x72f4,0xe74a,
-0x43a6,0xced1,0x78e9,0x96ed,0x1fcc,0xfc1c,0x3f75,0xdfd4,0x553a,0x81dd,0xf935,
-0x64f7,0xd206,0x1ada,0x9f38,0x6218,0xf633,0x3c5f,0xa24e,0xe321,0x4068,0xc998,
-0x211a,0xaa79,0x8295,0x3fd3,0xe16d,0x8ea3,0x5039,0xb289,0x5a34,0xc515,0x113a,
-0x74a4,0xbc2d,0x8323,0xe65a,0xabcb,0x5248,0xd085,0xb406,0x425c,0xa3df,0x1703,
-0xc638,0x8830,0x5893,0xfff3,0x3f98,0x1653,0x570e,0xf74a,0x9d68,0x1501,0xbafe,
-0x24f1,0x9590,0x0,0xea16,0x42ae,0x286d,0xf032,0x82c1,0xba5d,0x2799,0x7ac5,0xbb70,
-0x5e1e,0x1f62,0x9d21,0x3eef,0x252f,0xd116,0x884f,0x2ee0,0xa043,0x54a9,0x39b3,
-0x74e3,0xd9cb,0x4745,0xf4a6,0x3cc9,0x716f,0x9ac0,0x4e55,0xbf5f,0x81f4,0xa4fe,
-0x5c27,0xd6e8,0x6ceb,0xfa0d,0x4f78,0x7f8f,0x2935,0xa053,0x0,0x5636,0x2ea1,0x7e0a,
-0x1284,0xc653,0x6b66,0x8e15,0xcd73,0xae87,0x604c,0xa3a4,0x1348,0x5f06,0xe6ff,
-0x816f,0x2984,0x6323,0xdd34,0x507c,0x793c,0x9332,0x47bf,0x706f,0xc269,0x3771,
-0xcf10,0x97be,0xf071,0x2bf1,0x840f,0xb0a5,0x5aaa,0x1274,0xd511,0x68ed,0xb226,
-0x9cf,0x8e4c,0xbdba,0x1b01,0x99e0,0x3bb6,0xb6f9,0x851a,0xcce5,0x24c5,0x7a7e,
-0xc0f7,0x1e62,0x8cf6,0x0,0x7407,0xf3d2,0x4bb5,0xc8d0,0x675c,0xb374,0x0,0xef03,
-0x328f,0x8668,0xa605,0x44e8,0xfe99,0x2baa,0xcf3f,0x1260,0x3e75,0x8fb6,0x0,0x80a6,
-0x2769,0xd61c,0x71f1,0x3da9,0xb2cf,0x0,0xbc1d,0x92c4,0xe0ef,0xb78e,0x75e3,0x3cbd,
-0xc9fb,0x6e39,0xf86d,0x3bed,0xcc31,0x560b,0xbd8f,0x75d7,0xa92b,0xa0e,0x4b96,
-0xfc5f,0x971d,0x42f9,0xef3e,0x8820,0xc0ef,0xf1ee,0x70e1,0x1682,0x5821,0xdd5f,
-0x0,0xc7d4,0xe311,0x9b17,0x2b11,0x8b85,0x172f,0xb5da,0xd620,0xf27,0xfb28,0x6e65,
-0x34c9,0xf1b3,0x1a3d,0x9227,0x33e5,0xb554,0x1e52,0xe09c,0x444b,0xbcf2,0x7793,
-0xdaf2,0xb2df,0xe510,0x9750,0x3751,0xee00,0x1e99,0x55b8,0xbea,0xd25d,0x3812,
-0xddaa,0xb7e0,0x1f2b,0x558d,0xcc19,0x87da,0x3b24,0xa349,0xd06a,0xb19,0xaeed,
-0xe4c6,0x1b09,0x7f97,0x51ca,0x22d6,0xb8f4,0x60ba,0xdc97,0x20b4,0x8d9b,0xf11e,
-0x3dad,0x9f48,0x52e5,0xd1b8,0x6a9a,0x387c,0xce2c,0x5a30,0xec8a,0x0,0x5b20,0x3a2d,
-0xe3be,0x954d,0x4f98,0xee4e,0x65a8,0xd686,0xb624,0x2b34,0x8eca,0x1586,0xf9ce,
-0x3486,0x99d4,0x68ca,0xccc6,0x17eb,0xe9bf,0x699e,0x9857,0x5622,0x9fc5,0x72fc,
-0xb8e4,0xdc8f,0x6163,0xfc43,0xab36,0x4a50,0x94b3,0xed57,0x2ba6,0x7739,0x2116,
-0x6c17,0x2d7a,0x8d61,0xb2d,0xe364,0x8ba8,0x458d,0xac8c,0x635e,0xa110,0x83f7,
-0x1592,0xe02e,0x5386,0xd5b2,0xa152,0x6565,0x1916,0xc82b,0x2bc2,0x6632,0x104a,
-0x530c,0xb2a8,0xff55,0x9030,0xb531,0x6bd0,0x8953,0x1e82,0x5c99,0xbaa8,0xd55f,
-0x643e,0x9660,0x4cb5,0x7f9b,0xadba,0x1efb,0xb876,0x6602,0xca59,0x5423,0xe906,
-0x777f,0x9dea,0xc87d,0x63ec,0xfdf0,0x355a,0x8bf7,0x17dc,0x435f,0x6835,0xaf01,
-0x5c7d,0xbd97,0x9c51,0xfc5b,0x6d8c,0x92ef,0x46db,0x6f21,0x8e7c,0xee52,0x0,0xb1c0,
-0xf6ad,0x1bde,0x6721,0xf081,0x30cb,0x6011,0x9da3,0xf35c,0xab88,0xd7a9,0x8654,
-0xe5f,0x9a2b,0x40f6,0xb7d5,0x70a2,0xc573,0x21ea,0xed9e,0x2b7f,0x9d9b,0xf613,
-0x877b,0x27b0,0xb062,0x7545,0xdb87,0x9a66,0x6702,0xd38,0xb2e7,0x37b4,0xa17a,
-0x469c,0x88dd,0x5ff6,0xde72,0xa3b0,0x4fb3,0x7f01,0xe02a,0x45a1,0xa449,0x7d12,
-0x3582,0xc1c4,0x0,0xde99,0x38f2,0xf63b,0x5308,0x2a87,0xa203,0x1ecc,0x76af,0xe682,
-0xcdd,0x606c,0x9e93,0xd7c4,0x4b8e,0xeabb,0xabfe,0x5060,0xbd64,0x67de,0x2727,
-0xd42d,0x1091,0xe2de,0x26fb,0xf45f,0x4141,0x97dd,0x22e6,0x8928,0x2a9b,0xe832,
-0xb0d0,0x76f2,0xd9e7,0xa7bd,0xe1d7,0x81e0,0x3572,0x69ed,0x40c7,0x20a8,0xef32,
-0x447e,0xa972,0xfc8a,0xbda,0x7cac,0x318c,0xf206,0x23ed,0xe28c,0x3b4f,0x8f97,
-0xdf79,0x3bf5,0x9fe9,0x0,0xc4da,0x2c2c,0x569c,0xec5,0x8f6b,0x1de0,0xad44,0x5868,
-0xcf82,0xa2f7,0xf803,0x0,0xdaa3,0x3d33,0x7fd6,0x34d5,0xb38c,0x1c9e,0xf430,0xaa32,
-0x3239,0xbadb,0x7300,0x53cd,0x2d6e,0x9082,0xc189,0x4f7c,0x8a95,0xd6d5,0x4215,
-0x0,0x682d,0x2cc5,0x4d27,0xff98,0xc677,0x5d3a,0xe6f4,0x0,0x5571,0x904f,0x7850,
-0xc261,0x4ab6,0xf0b,0x6c07,0xe11e,0x8e54,0x4623,0xbb02,0x1cf9,0xfafd,0xc7a5,
-0x79aa,0xdb44,0x2321,0xfc38,0x12da,0xc43d,0x39ce,0x6ea3,0xd86d,0x2305,0xafa6,
-0x114d,0xee0c,0x5798,0xd567,0x8f11,0x6044,0xafd1,0x810c,0x14ca,0xc956,0x8674,
-0xeade,0x5b76,0xca94,0x30e3,0xb349,0xcbf6,0x19ee,0x832b,0xc0a5,0xfb1,0x7282,
-0xd241,0x1e33,0xfa97,0xaaf7,0x53d1,0x98f4,0x7996,0x4d37,0xb451,0x69c5,0xc7fc,
-0xf997,0x7224,0xc226,0x3af1,0x5761,0x0,0x902c,0x4263,0x2647,0x9c80,0xc79d,0xe30d,
-0xa59b,0xd1a4,0x5fd6,0xc21e,0x29ee,0x81c9,0x4572,0xe1e7,0xb464,0x5911,0xc74f,
-0x6c23,0xbeb9,0x5a44,0x1165,0x76a3,0xfe33,0x89a9,0x66fe,0xabd7,0xf0b4,0x7df2,
-0xd9bb,0xc1fb,0x3f80,0xedc1,0x74b4,0x284d,0x83cc,0x500a,0x8f40,0xcb5c,0x15c9,
-0xe846,0x5343,0xc6dd,0x68e5,0xfa5,0xd0b4,0x4652,0x9c26,0xe62f,0x7b5a,0xdc5c,
-0x39e6,0xa8d4,0x1424,0xaf9a,0x756d,0xd2af,0x8dfe,0xe4b6,0x9cb3,0x7257,0x1c96,
-0x8481,0x3769,0xa15a,0xfb63,0xca12,0x1405,0x65b8,0xe4a6,0xa361,0xc0d0,0x4efe,
-0x138b,0xf293,0x3003,0x805b,0x3da5,0x5abd,0x199c,0x94df,0x6c03,0xadf1,0x599e,
-0x932a,0xf393,0xb50,0xc288,0x909a,0x4d62,0xc68a,0x30fe,0x97ae,0x1c2c,0x43ae,
-0xeb6f,0x25fc,0xd450,0x64c0,0xa78e,0x40f2,0x0,0xafb9,0x4453,0x9b0b,0x7ab5,0x3e91,
-0xf941,0x362b,0x5e2e,0x9a03,0xf1ab,0x35ec,0x96b6,0x40e2,0x7bbc,0xe67a,0x36f7,
-0xbf1c,0xdb25,0xb70,0x89ec,0x2f75,0x57f6,0xecd,0x9670,0xdacb,0x85b7,0xf71b,0x5fe6,
-0xc46c,0xeec4,0x5ea8,0xa49,0x87ba,0x2955,0x7ccf,0x10ef,0x8f21,0xd871,0xb540,
-0x6996,0x93cc,0x1dfc,0x8015,0x0,0x97d1,0x28a4,0xeff3,0xa375,0xc596,0x2695,0x40fe,
-0xd865,0x183a,0x9143,0x2ec4,0x4d9d,0x72cd,0x9a3e,0xd30,0xc062,0x4860,0xb65f,
-0xe245,0x2ab6,0x5f25,0xae63,0x70c6,0x9867,0x30fa,0xe1a4,0x8b9d,0x60e6,0xffeb,
-0x170b,0x3c33,0xb458,0xded,0x70aa,0xfca2,0x5b9d,0xe3d6,0x246b,0xb975,0x4579,
-0x1842,0xc5c6,0x35a1,0xa9b8,0xdfad,0xc004,0x68de,0x285d,0x4878,0xb03b,0x8e0d,
-0x202e,0x6039,0x2b44,0xd727,0xaadf,0x684c,0x9c0e,0xe0f3,0xbf37,0xa207,0xeecc,
-0x48c7,0xd438,0x363a,0xe175,0x2742,0x7887,0xaaac,0x32e2,0x6cdb,0xff22,0x8910,
-0x6481,0xb431,0xf7b0,0x7f83,0xaaff,0x54f4,0x8d12,0x34e4,0xe56b,0x7ea3,0xd514,
-0x6a92,0xf7a4,0x1454,0xdc2c,0x644e,0x887b,0xab69,0xdfb1,0x2691,0x56a0,0xbaeb,
-0x6e70,0xc567,0x0,0xa521,0x6d71,0x1b54,0x93b4,0x5de3,0xeed4,0xbec9,0xa232,0xea31,
-0x638e,0x210e,0xbb74,0x2f4e,0xac31,0x1737,0x7e41,0xb199,0x4970,0xbcbe,0x596f,
-0xb4bf,0xf988,0x3aed,0x5794,0x17e4,0xf135,0x3537,0xd477,0xa6ba,0xfade,0x4e89,
-0xd294,0x8120,0x37fa,0x6
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list